| f371d3e | Junio C Hamano | 08 December 2008, 01:34:14 UTC | Point "stale" 1.6.0.5 documentation from the main git documentation page Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 December 2008, 01:34:14 UTC |
| 0e32126 | Junio C Hamano | 08 December 2008, 01:30:35 UTC | Revert "git-stash: use git rev-parse -q" This reverts commit 757c7f60a78004fc3d0ea62f44320d54ef430c10 as an unnecessary error message to pop up when the last stash entry is dropped. It simply is not worth the aggravation. | 08 December 2008, 01:30:35 UTC |
| 0516cc5 | Junio C Hamano | 07 December 2008, 23:06:38 UTC | Update draft release notes for 1.6.1 A handful of fixes have been backmerged to 'maint' and are now contained in 1.6.0.X series as the result, so drop them from this document. Also contains typofix and duplicate removal pointed out by Bjørn Lindeijer and Jakub Narebski. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 23:14:26 UTC |
| 3a59bb2 | Junio C Hamano | 07 December 2008, 23:13:02 UTC | Merge branch 'maint' * maint: GIT 1.6.0.5 "git diff <tree>{3,}": do not reverse order of arguments tag: delete TAG_EDITMSG only on successful tag gitweb: Make project specific override for 'grep' feature work http.c: use 'git_config_string' to get 'curl_http_proxy' fetch-pack: Avoid memcpy() with src==dst | 07 December 2008, 23:13:02 UTC |
| 1c2ed59 | Junio C Hamano | 07 December 2008, 11:03:16 UTC | GIT 1.6.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 23:11:54 UTC |
| dbc2fb6 | Matt McCutchen | 11 October 2008, 01:56:15 UTC | "git diff <tree>{3,}": do not reverse order of arguments According to the message of commit 0fe7c1de16f71312e6adac4b85bddf0d62a47168, "git diff" with three or more trees expects the merged tree first followed by the parents, in order. However, this command reversed the order of its arguments, resulting in confusing diffs. A comment /* Again, the revs are all reverse */ suggested there was a reason for this, but I can't figure out the reason, so I removed the reversal of the arguments. Test case included. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 07 December 2008, 22:57:57 UTC |
| 3927bbe | Jeff King | 06 December 2008, 19:40:34 UTC | tag: delete TAG_EDITMSG only on successful tag The user may put some effort into writing an annotated tag message. When the tagging process later fails (which can happen fairly easily, since it may be dependent on gpg being correctly configured and used), there is no record left on disk of the tag message. Instead, let's keep the TAG_EDITMSG file around until we are sure the tag has been created successfully. If we die because of an error, the user can recover their text from that file. Leaving the file in place causes no conflicts; it will be silently overwritten by the next annotated tag creation. This matches the behavior of COMMIT_EDITMSG, which stays around in case of error. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:53:45 UTC |
| bcc6a83 | Jakub Narebski | 07 December 2008, 09:36:36 UTC | gitweb: Make project specific override for 'grep' feature work The 'grep' feature was marked in the comments as having project specific config, but it lacked 'sub' key required for it to work. Kind-of-Noticed-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:52:37 UTC |
| e4a80ec | Miklos Vajna | 07 December 2008, 00:45:37 UTC | http.c: use 'git_config_string' to get 'curl_http_proxy' Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:41:55 UTC |
| d551bba | Thomas Rast | 06 December 2008, 20:50:09 UTC | fetch-pack: Avoid memcpy() with src==dst memcpy() may only be used for disjoint memory areas, but when invoked from cmd_fetch_pack(), we have my_args == &args. (The argument cannot be removed entirely because transport.c invokes with its own variable.) Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 December 2008, 10:41:45 UTC |
| 2dd6202 | Junio C Hamano | 06 December 2008, 04:02:55 UTC | Update draft release notes to 1.6.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 December 2008, 04:02:55 UTC |
| d8af75d | Junio C Hamano | 06 December 2008, 04:02:15 UTC | Merge branch 'jc/am-options' * jc/am-options: git-am: rename apply_opt_extra file to apply-opt Test that git-am does not lose -C/-p/--whitespace options git-am: propagate --3way options as well git-am: propagate -C<n>, -p<n> options as well git-am --whitespace: do not lose the command line option | 06 December 2008, 04:02:15 UTC |
| 9b9f5a2 | Junio C Hamano | 05 December 2008, 19:19:43 UTC | git-am: rename apply_opt_extra file to apply-opt All other state files use dash in their names, not underscores. Also, there is no reason to call this "extra". Drop it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 December 2008, 04:02:10 UTC |
| fe6beab | Junio C Hamano | 05 December 2008, 01:08:48 UTC | Test that git-am does not lose -C/-p/--whitespace options These tests make sure that "git am" does not lose command line options specified when it was started, after it is interrupted by a patch that does not apply earlier in the series. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:45:02 UTC |
| 22db240 | Junio C Hamano | 04 December 2008, 23:38:27 UTC | git-am: propagate --3way options as well The reasoning is the same as the previous patch, where we made -C<n> and -p<n> propagate across a failure. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:45:02 UTC |
| a200337 | Junio C Hamano | 04 December 2008, 23:38:27 UTC | git-am: propagate -C<n>, -p<n> options as well These options are meant to deal with patches that do not apply cleanly due to the differences between the version the patch was based on and the version "git am" is working on. Because a series of patches applied in the same "git am" run tends to come from the same source, it is more useful to propagate these options after the application stops. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:45:01 UTC |
| 1556ef1 | Junio C Hamano | 04 December 2008, 23:03:28 UTC | git-am --whitespace: do not lose the command line option When you start "git am --whitespace=fix" and the patch application process is interrupted by an unapplicable patch early in the series, after fixing the offending patch, the remainder of the patch should be processed still with --whitespace=fix when restarted with "git am --resolved" (or dropping the offending patch with "git am --skip"). The breakage was introduced by the commit 67dad68 (add -C[NUM] to git-am, 2007-02-08); this should fix it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:45:01 UTC |
| 7f705dc | Tor Arvid Lund | 04 December 2008, 13:37:33 UTC | git-p4: Fix bug in p4Where method. When running: p4 where //depot/SomePath/... The result can in some situations look like: //depot/SomePath/... //client/SomePath/... /home/user/p4root/SomePath/... -//depot/SomePath/UndesiredSubdir/... //client/SomePath/UndesiredSubdir/... /home/user/p4root/SomePath/UndesiredSubdir/... This depends on the users Client view. The current p4Where method will now return /home/user/p4root/SomePath/UndesiredSubdir/... which is not what we want. This patch loops through the results from "p4 where", and picks the one where the depotFile exactly matches the given depotPath (//depot/SomePath/... in this example). Signed-off-by: Tor Arvid Lund <torarvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:44:16 UTC |
| 304dcf2 | Alex Riesen | 05 December 2008, 00:39:14 UTC | Report symlink failures in merge-recursive Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:05:51 UTC |
| 7be77de | Alex Riesen | 05 December 2008, 00:36:46 UTC | Make chdir failures visible Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:05:51 UTC |
| 47d32af | Alex Riesen | 05 December 2008, 00:35:48 UTC | Make some of fwrite/fclose/write/close failures visible So that full filesystem conditions or permissions problems won't go unnoticed. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 December 2008, 02:05:41 UTC |
| 123ed65 | Junio C Hamano | 04 December 2008, 06:44:26 UTC | Merge branch 'dm/svn-remote' * dm/svn-remote: git-svn: Make branch use correct svn-remote | 04 December 2008, 06:44:26 UTC |
| ad68568 | Junio C Hamano | 04 December 2008, 06:03:09 UTC | Merge branch 'jn/gitweb-utf8' * jn/gitweb-utf8: gitweb: Fix handling of non-ASCII characters in inserted HTML files | 04 December 2008, 06:03:09 UTC |
| c76b4c8 | Jeff King | 04 December 2008, 03:42:03 UTC | add stage to gitignore This is a generated builtin since 24b1f65f (Install git-stage in exec-path). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 December 2008, 05:29:03 UTC |
| 30353a4 | Miklos Vajna | 03 December 2008, 13:26:52 UTC | submodule: use git rev-parse -q Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 22:27:18 UTC |
| 5a92d19 | Miklos Vajna | 03 December 2008, 13:26:51 UTC | rebase: use git rev-parse -q Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 22:27:17 UTC |
| 2d17985 | Miklos Vajna | 03 December 2008, 13:26:50 UTC | pull: use git rev-parse -q Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 22:27:17 UTC |
| a86e8c1 | Miklos Vajna | 03 December 2008, 13:26:49 UTC | lost-found: use git rev-parse -q Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 22:27:17 UTC |
| d69da76 | Miklos Vajna | 03 December 2008, 13:26:48 UTC | filter-branch: use git rev-parse -q Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 22:27:17 UTC |
| a0fbc87 | Deskin Miller | 02 December 2008, 02:43:00 UTC | git-svn: Make branch use correct svn-remote The 'branch' subcommand incorrectly had the svn-remote to use hardcoded as 'svn', the default remote name. This meant that branches derived from other svn-remotes would try to use the branch and tag configuration for the 'svn' remote, potentially copying would-be branches to the wrong place in SVN, into the branch namespace for another project. Fix this by using the remote name extracted from the svn info for the specified git ref. Add a testcase for this behaviour. [jc: squashed in a fix to test from Michael J Gruber for older svn (1.4)] Signed-off-by: Deskin Miller <deskinm@umich.edu> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 09:54:24 UTC |
| ae26e7c | Junio C Hamano | 03 December 2008, 08:38:12 UTC | Merge branch 'jc/rm-i-t-a' * jc/rm-i-t-a: git add --intent-to-add: do not let an empty blob be committed by accident git add --intent-to-add: fix removal of cached emptiness builtin-rm.c: explain and clarify the "local change" logic Extend index to save more flags | 03 December 2008, 08:38:12 UTC |
| 6dbcb59 | Junio C Hamano | 03 December 2008, 08:34:58 UTC | Merge branch 'maint' * maint: xdiff: give up scanning similar lines early | 03 December 2008, 08:34:58 UTC |
| 24b1f65 | Junio C Hamano | 03 December 2008, 08:30:34 UTC | Install git-stage in exec-path Earlier the plan was to eventually eradicate git-foo executables from the filesystem for all the built-in commands, but when we released 1.6.0 we decided not to do so. Instead, it has been promised that by prepending the output from $(git --exec-path) to your $PATH, you can keep using the dashed form of commands. This also allows "git stage" to appear in the autogenerated command list, which is used to offer man pages by "git help" command. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 08:30:34 UTC |
| 2ab4de5 | Junio C Hamano | 03 December 2008, 07:47:25 UTC | Merge branch 'jk/maint-commit-v-strip' into maint * jk/maint-commit-v-strip: commit: Fix stripping of patch in verbose mode. | 03 December 2008, 07:47:25 UTC |
| 733070b | Davide Libenzi | 08 November 2008, 05:24:33 UTC | xdiff: give up scanning similar lines early In a corner case of large files whose lines do not match uniquely, the loop to eliminate a line that matches multiple locations adjacent to a run of lines that do not uniquely match wasted too much cycles. Fix this by giving up early after scanning 100 lines in both direction. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 07:45:37 UTC |
| 0fd9d7e | Junio C Hamano | 03 December 2008, 07:00:04 UTC | Merge branch 'bc/maint-keep-pack' into maint * bc/maint-keep-pack: repack: only unpack-unreachable if we are deleting redundant packs t7700: test that 'repack -a' packs alternate packed objects pack-objects: extend --local to mean ignore non-local loose objects too sha1_file.c: split has_loose_object() into local and non-local counterparts t7700: demonstrate mishandling of loose objects in an alternate ODB builtin-gc.c: use new pack_keep bitfield to detect .keep file existence repack: do not fall back to incremental repacking with [-a|-A] repack: don't repack local objects in packs with .keep file pack-objects: new option --honor-pack-keep packed_git: convert pack_local flag into a bitfield and add pack_keep t7700: demonstrate mishandling of objects in packs with a .keep file | 03 December 2008, 07:00:04 UTC |
| e23f682 | Junio C Hamano | 03 December 2008, 06:38:07 UTC | Merge branch 'js/mingw-rename-fix' into maint * js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files | 03 December 2008, 06:38:07 UTC |
| 2dcb5e1 | Jakub Narebski | 01 December 2008, 18:01:42 UTC | gitweb: Fix handling of non-ASCII characters in inserted HTML files Use new insert_file() subroutine to insert HTML chunks from external files: $site_header, $home_text (by default indextext.html), $site_footer, and $projectroot/$project/REAME.html. All non-ASCII chars of those files will be broken by Perl IO layer without decoding to utf8, so insert_file() does to_utf8() on each printed line; alternate solution would be to open those files with "binmode $fh, ':utf8'", or even all files with "use open qw(:std :utf8)". Note that inserting README.html lost one of checks for simplicity. Noticed-by: Tatsuki Sugiura <sugi@nemui.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 02:03:07 UTC |
| 757c7f6 | Miklos Vajna | 02 December 2008, 00:56:09 UTC | git-stash: use git rev-parse -q Don't redirect stderr to /dev/null, use -q to suppress the output on stderr. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 00:54:01 UTC |
| 9b3b7fd | Junio C Hamano | 03 December 2008, 00:13:21 UTC | Merge branch 'maint' * maint: User's Manual: remove duplicated url at the end of Appendix B | 03 December 2008, 00:13:21 UTC |
| deb1387 | Johannes Sixt | 02 December 2008, 08:31:01 UTC | t4030-diff-textconv: Make octal escape sequence more portable There are printfs around that do not grok '\1', but need '\01'. Discovered on AIX 4.3.x. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 00:13:16 UTC |
| 11920d2 | Scott Chacon | 02 December 2008, 06:14:55 UTC | Add a built-in alias for 'stage' to the 'add' command This comes from conversation at the GitTogether where we thought it would be helpful to be able to teach people to 'stage' files because it tends to cause confusion when told that they have to keep 'add'ing them. This continues the movement to start referring to the index as a staging area (eg: the --staged alias to 'git diff'). Also adds a doc file for 'git stage' that basically points to the docs for 'git add'. Signed-off-by: Scott Chacon <schacon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 December 2008, 00:13:16 UTC |
| d404bf0 | Linus Torvalds | 01 December 2008, 16:41:50 UTC | Add backslash to list of 'crud' characters in real name We remove crud characters at the beginning and end of real-names so that when we see email addresses like From: "David S. Miller" <davem@davemloft.net> we drop the quotes around the name when we parse that and split it up into name and email. However, the list of crud characters was basically just a random list of common things that are found around names, and it didn't contain the backslash character that some insane scripts seem to use when quoting things. So now the kernel has a number of authors listed like Author: \"Rafael J. Wysocki\ <rjw@sisk.pl> because the author name had started out as From: \"Rafael J. Wysocki\" <rjw@sisk.pl> and the only "crud" character we noticed and removed was the final double-quote at the end. We should probably do better quote removal from names anyway, but this is the minimal obvious patch. Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2008, 23:29:13 UTC |
| 46059cc | Junio C Hamano | 15 November 2008, 12:08:14 UTC | Makefile: introduce NO_PTHREADS This introduces make variable NO_PTHREADS for platforms that lack the support for pthreads library or people who do not want to use it for whatever reason. When defined, it makes the multi-threaded index preloading into a no-op, and also disables threaded delta searching by pack-objects. Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Tested-by: Johannes Sixt <j6t@kdbg.org> (AIX 4.3.x) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2008, 23:29:12 UTC |
| 5413812 | Christian Couder | 02 December 2008, 13:53:51 UTC | Documentation: describe how to "bisect skip" a range of commits Signed-off-by: Christian Couder <chriscool@tuxfamily.org> | 02 December 2008, 23:29:12 UTC |
| 1a66a48 | Christian Couder | 02 December 2008, 13:53:47 UTC | bisect: fix "git bisect skip <commit>" and add tests cases The patch that allows "git bisect skip" to be passed a range of commits using the "<commit1>..<commit2>" notation is flawed because it introduces a regression when it was passed a simple rev or commit. "git bisect skip <commit>" doesn't work any more, because <commit> is quoted but not properly unquoted. This patch fixes that and add tests cases to better check when it is passed commits and range of commits. While at it, this patch also properly quotes the non range arguments using the "sq" function. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> | 02 December 2008, 23:29:12 UTC |
| ff3c0ff | Giuseppe Bilotta | 02 December 2008, 22:57:28 UTC | Update comment on gitweb_check/get_feature This is taken from a patch from Giuseppe but unfortunately it came too late to replace the series that was already on "next". The comment he updated here is better than the version we had previously, so I am cherry-picking this bit not to lose it. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2008, 23:28:36 UTC |
| dcbe0bd | Junio C Hamano | 02 December 2008, 23:27:22 UTC | Merge branch 'gb/gitweb-feature' * gb/gitweb-feature: gitweb: make gitweb_check_feature a boolean wrapper gitweb: rename gitweb_check_feature to gitweb_get_feature gitweb: fix 'ctags' feature check and others | 02 December 2008, 23:27:29 UTC |
| ed56049 | Junio C Hamano | 02 December 2008, 23:27:05 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror. | 02 December 2008, 23:27:05 UTC |
| 521ae13 | Junio C Hamano | 02 December 2008, 23:25:48 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Add a menu option to start git gui gitk: Make line origin search update the busy status gitk: Update German translation gitk: Fix bug in accessing undefined "notflag" variable gitk: Highlight only when search type is "containing:". gitk: Fix context menu items for generating diffs when in tree mode | 02 December 2008, 23:25:48 UTC |
| 25e30fa | Miklos Vajna | 01 December 2008, 18:50:02 UTC | User's Manual: remove duplicated url at the end of Appendix B Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 December 2008, 23:17:07 UTC |
| 861c68e | Mark Burton | 02 December 2008, 15:15:02 UTC | git-gui: Teach start_push_anywhere_action{} to notice when remote is a mirror. When the destination repository is a mirror, this function goofed by still passing a refspec to git-push. Now it notices that the remote is a mirror and holds the refspec. Signed-off-by: Mark Burton <markb@ordern.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 02 December 2008, 15:20:19 UTC |
| 7fb0abb | Alexander Gavrilov | 13 November 2008, 20:12:42 UTC | gitk: Add a menu option to start git gui Git gui already has menu commands to start gitk, and this makes the relation symmetric. [paulus@samba.org - changed "Git Gui" in the menu item to "git gui"] Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 December 2008, 22:43:12 UTC |
| f341307 | Alexander Gavrilov | 01 December 2008, 17:30:09 UTC | gitk: Make line origin search update the busy status Currently the 'show origin of this line' feature does not update the status field of the gitk window, so it is not evident that any processing is going on. It may seem at first that clicking the item had no effect. This commit adds calls to set and clear the busy status with an appropriate title, similar to other search commands. Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com> Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 December 2008, 22:43:12 UTC |
| a8833ef | Christian Stimming | 25 October 2008, 11:25:35 UTC | gitk: Update German translation This takes into account the most recent po file merge. Signed-off-by: Christian Stimming <stimming@tuhh.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 December 2008, 22:40:28 UTC |
| 6e7e87c | Paul Mackerras | 01 December 2008, 22:17:46 UTC | gitk: Fix bug in accessing undefined "notflag" variable As pointed out by Johannes Sixt and Alexander Gavrilov, commit 2958228430b63f2e38c55519d1f98d8d6d9e23f3 ("gitk: Fix switch statement in parseviewargs") exposed a latent bug in that $notflag was never initialized. Since it isn't used either, this removes it entirely. Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 December 2008, 22:28:06 UTC |
| 8b39e04 | Paul Mackerras | 01 December 2008, 22:02:46 UTC | gitk: Highlight only when search type is "containing:". When the search type is "touching paths" or "adding/removing string", it's not very useful to highlight instances of the search string in the commit message, headline or author name, so this disables the highlighting in those cases. This was suggested by Mark Burton <markb@ordern.com>, but the implementation is different to his patch, which tested $gdttype at each place where $markingmatches was tested. Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 December 2008, 22:27:30 UTC |
| 3273ebc | Junio C Hamano | 01 December 2008, 07:01:53 UTC | GIT 1.6.1-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 08:55:19 UTC |
| aaab7ea | Junio C Hamano | 01 December 2008, 08:53:54 UTC | Include git-gui--askpass in git-gui RPM package Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 08:54:16 UTC |
| 39a76bd | Junio C Hamano | 01 December 2008, 06:59:41 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Avoid handling the Return key twice in Add Branch gitk: Show local changes properly when we have a path limit gitk: Fix switch statement in parseviewargs gitk: Index line[hnd]tag arrays by id rather than row number | 01 December 2008, 06:59:41 UTC |
| 363cfc1 | Junio C Hamano | 01 December 2008, 06:54:39 UTC | Merge git://repo.or.cz/git-gui * git://repo.or.cz/git-gui: git-gui: update Japanese translation git-gui: french translation update Updated Swedish translation (514t0f0u). git gui: update Italian translation Update Hungarian translation. 100% completed. | 01 December 2008, 06:54:39 UTC |
| 69f4ce5 | Junio C Hamano | 01 December 2008, 06:38:20 UTC | send-email: do not reverse the command line arguments The loop picks elements from @ARGV one by one, sifts them into arguments meant for format-patch and the script itself, and pushes them to @files and @rev_list_opts arrays. Pick elements from @ARGV starting at the beginning using shift, instead of at the end using pop, as push appends them to the end of the array. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 06:38:20 UTC |
| 7f871c6 | Junio C Hamano | 01 December 2008, 02:43:56 UTC | Merge branch 'maint' * maint: Update draft release notes to 1.6.0.5 generate-cmdlist.sh: avoid selecting synopsis at wrong place | 01 December 2008, 02:43:56 UTC |
| 5359fde | Junio C Hamano | 01 December 2008, 02:33:20 UTC | Update draft release notes to 1.6.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:33:20 UTC |
| 27f6496 | Junio C Hamano | 01 December 2008, 02:18:50 UTC | Merge branch 'st/maint-tag' into maint * st/maint-tag: tag: Add more tests about mixing incompatible modes and options tag: Check that options are only allowed in the appropriate mode | 01 December 2008, 02:18:50 UTC |
| 270c354 | Junio C Hamano | 01 December 2008, 02:18:11 UTC | Merge branch 'mk/maint-cg-push' into maint * mk/maint-cg-push: git push: Interpret $GIT_DIR/branches in a Cogito compatible way | 01 December 2008, 02:18:11 UTC |
| 16d2583 | Nguyễn Thái Ngọc Duy | 30 November 2008, 10:54:31 UTC | generate-cmdlist.sh: avoid selecting synopsis at wrong place In "common" man pages there is luckily no "NAME" anywhere except at beginning of documents. If there is another "NAME", sed could mis-select it and lead to common-cmds.h corruption. So better nail it at beginning of line, which would reduce corruption chance. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:16:32 UTC |
| 25b2790 | Giuseppe Bilotta | 29 November 2008, 21:07:29 UTC | gitweb: make gitweb_check_feature a boolean wrapper The gitweb_get_feature() function retrieves the configuration parameters for the feature (such as the list of snapshot formats or the list of additional actions), but it is very often used to see if feature is enabled (which is returned as the first element in the list). Because accepting the returned list in the scalar context by mistake yields the number of elements in the array, which is non-zero in all cases, such a mistake would result in a bug for the latter use, with disabled features appearing enabled. All existing callers that call the function for this purpose assign the return value in the list context to retrieve the first element, but that is only because we fixed careless callers recently. This adds gitweb_check_feature() as a wrapper to gitweb_get_feature() that can be called safely in the scalar context to see if a feature is enabled to reduce the risk of future bugs. Callers of "get" that use the call only to see if the feature is enabled are updated to call this wrapper. Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:15:52 UTC |
| a7c5a28 | Junio C Hamano | 29 November 2008, 21:02:08 UTC | gitweb: rename gitweb_check_feature to gitweb_get_feature The function is about retrieving the configuration parameter list for the feature. A more robust way to check if a feature is enabled will be introduced in the next patch, and the function will be called gitweb_check_feature. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:15:52 UTC |
| 8d2dbba | Junio C Hamano | 29 November 2008, 20:53:41 UTC | gitweb: fix 'ctags' feature check and others gitweb_check_feature() function is to retrieve the configuration parameter list and calling it in the scalar context does not give its first element that tells if the feature is enabled. This fixes all the existing callers to call the function correctly in the list context. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 02:15:51 UTC |
| 331fcb5 | Junio C Hamano | 29 November 2008, 03:56:34 UTC | git add --intent-to-add: do not let an empty blob be committed by accident Writing a tree out of an index with an "intent to add" entry is blocked. This implies that you cannot "git commit" from such a state; however you can still do "git commit -a" or "git commit $that_path". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 December 2008, 01:59:19 UTC |
| 388b2ac | Junio C Hamano | 29 November 2008, 03:55:25 UTC | git add --intent-to-add: fix removal of cached emptiness This uses the extended index flag mechanism introduced earlier to mark the entries added to the index via "git add -N" with CE_INTENT_TO_ADD. The logic to detect an "intent to add" entry for the purpose of allowing "git rm --cached $path" is tightened to check not just for a staged empty blob, but with the CE_INTENT_TO_ADD bit. This protects an empty blob that was explicitly added and then modified in the work tree from being dropped with this sequence: $ >empty $ git add empty $ echo "non empty" >empty $ git rm --cached empty Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2008, 03:58:24 UTC |
| 69530cb | Junio C Hamano | 29 November 2008, 02:41:21 UTC | builtin-rm.c: explain and clarify the "local change" logic Explain the logic to check local modification a bit more in the comment, especially because the existing comment that talks about "git rm --cached" was placed in a part that was not about "--cached" at all. Also clarify "if .. else if .." structure. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 November 2008, 02:41:21 UTC |
| fe60dff | Junio C Hamano | 29 November 2008, 01:22:35 UTC | Merge branch 'nd/narrow' (early part) into jc/add-i-t-a * 'nd/narrow' (early part): Extend index to save more flags | 29 November 2008, 01:22:35 UTC |
| d5cbdba | Junio C Hamano | 28 November 2008, 03:25:25 UTC | Merge branch 'cc/bisect-skip' * cc/bisect-skip: bisect: teach "skip" to accept special arguments like "A..B" | 28 November 2008, 03:25:25 UTC |
| 8c1944d | Junio C Hamano | 28 November 2008, 03:25:06 UTC | Merge branch 'js/mingw-rename-fix' * js/mingw-rename-fix: compat/mingw.c: Teach mingw_rename() to replace read-only files | 28 November 2008, 03:25:06 UTC |
| ef4daa7 | Junio C Hamano | 28 November 2008, 03:24:47 UTC | Merge branch 'st/levenshtein' * st/levenshtein: Document levenshtein.c Fix deletion of last character in levenshtein distance | 28 November 2008, 03:24:47 UTC |
| cab7d7d | Junio C Hamano | 28 November 2008, 03:24:40 UTC | Merge branch 'cr/remote-update-v' * cr/remote-update-v: git-remote: add verbose mode to git remote update | 28 November 2008, 03:24:40 UTC |
| 2d2b3fd | Junio C Hamano | 28 November 2008, 03:24:36 UTC | Merge branch 'rs/strbuf-expand' * rs/strbuf-expand: remove the unused files interpolate.c and interpolate.h daemon: deglobalize variable 'directory' daemon: inline fill_in_extra_table_entries() daemon: use strbuf_expand() instead of interpolate() merge-recursive: use strbuf_expand() instead of interpolate() add strbuf_expand_dict_cb(), a helper for simple cases | 28 November 2008, 03:24:36 UTC |
| 14de739 | Junio C Hamano | 28 November 2008, 03:24:25 UTC | Merge branch 'mv/clone-strbuf' * mv/clone-strbuf: builtin_clone: use strbuf in cmd_clone() builtin-clone: use strbuf in clone_local() and copy_or_link_directory() builtin-clone: use strbuf in guess_dir_name() | 28 November 2008, 03:24:25 UTC |
| 2af9664 | Junio C Hamano | 28 November 2008, 03:24:13 UTC | Merge branch 'lt/preload-lstat' * lt/preload-lstat: Fix index preloading for racy dirty case Add cache preload facility | 28 November 2008, 03:24:13 UTC |
| 98cdf78 | Junio C Hamano | 28 November 2008, 03:24:11 UTC | Merge branch 'ta/quiet-pull' * ta/quiet-pull: Retain multiple -q/-v occurrences in git pull Teach/Fix pull/fetch -q/-v options | 28 November 2008, 03:24:11 UTC |
| 496db64 | Junio C Hamano | 28 November 2008, 03:24:00 UTC | Merge branch 'ph/send-email' * ph/send-email: git send-email: ask less questions when --compose is used. git send-email: add --annotate option git send-email: interpret unknown files as revision lists git send-email: make the message file name more specific. | 28 November 2008, 03:24:00 UTC |
| 455d0f5 | Junio C Hamano | 28 November 2008, 03:23:51 UTC | Merge branch 'maint' * maint: sha1_file.c: resolve confusion EACCES vs EPERM sha1_file: avoid bogus "file exists" error message git checkout: don't warn about unborn branch if -f is already passed bash: offer refs instead of filenames for 'git revert' bash: remove dashed command leftovers git-p4: fix keyword-expansion regex fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags | 28 November 2008, 03:23:51 UTC |
| 539eec4 | Junio C Hamano | 28 November 2008, 03:23:27 UTC | Merge branch 'mv/fast-export' into maint * mv/fast-export: fast-export: use an unsorted string list for extra_refs Add new testcase to show fast-export does not always exports all tags | 28 November 2008, 03:23:27 UTC |
| 3524357 | Sam Vilain | 14 November 2008, 07:19:34 UTC | sha1_file.c: resolve confusion EACCES vs EPERM An earlier commit 916d081 (Nicer error messages in case saving an object to db goes wrong, 2006-11-09) confused EACCES with EPERM, the latter of which is an unlikely error from mkstemp(). Signed-off-by: Sam Vilain <sam@vilain.net> | 28 November 2008, 03:11:21 UTC |
| 65117ab | Joey Hess | 20 November 2008, 18:56:28 UTC | sha1_file: avoid bogus "file exists" error message This avoids the following misleading error message: error: unable to create temporary sha1 filename ./objects/15: File exists mkstemp can fail for many reasons, one of which, ENOENT, can occur if the directory for the temp file doesn't exist. create_tmpfile tried to handle this case by always trying to mkdir the directory, even if it already existed. This caused errno to be clobbered, so one cannot tell why mkstemp really failed, and it truncated the buffer to just the directory name, resulting in the strange error message shown above. Note that in both occasions that I've seen this failure, it has not been due to a missing directory, or bad permissions, but some other, unknown mkstemp failure mode that did not occur when I ran git again. This code could perhaps be made more robust by retrying mkstemp, in case it was a transient failure. Signed-off-by: Joey Hess <joey@kitenet.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:48:53 UTC |
| 1510dbe | Matt McCutchen | 24 November 2008, 06:55:22 UTC | git checkout: don't warn about unborn branch if -f is already passed I think it's unnecessary to warn that the checkout has been forced due to an unborn current branch if -f has been explicitly passed. For one project, I am using git-new-workdir to create workdirs from a bare repository whose HEAD is set to an unborn branch, and this warning started to irritate me. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:35:28 UTC |
| c078383 | SZEDER Gábor | 27 November 2008, 13:35:53 UTC | bash: offer refs instead of filenames for 'git revert' The completion script for 'git revert' currently offers options and filenames. However, 'git revert' doesn't take any filenames from the command line, but a single commit. Therefore, it's more sane to offer refs instead. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:35:07 UTC |
| 608efb8 | SZEDER Gábor | 28 November 2008, 00:46:38 UTC | bash: complete full refs Sometimes it's handy to complete full refs, e.g. the user has some refs outside of refs/{heads,remotes,tags} or the user wants to complete some git command's special refs (like 'git show refs/bisect/bad'). To do that, we check whether the ref to be completed starts with 'refs/' or is 'refs' (to reduce the risk of matching 'refs-'). If it does, then we offer full refs for completion; otherwise everything works as usual. This way the impact on the common case is fairly small (hopefully not many users have branches or tags starting with 'refs'), and in the special case the cost of typing out 'refs' is bearable. While at it, also remove the unused 'cmd' variable from '__git_refs'. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:34:30 UTC |
| 8d8163f | SZEDER Gábor | 27 November 2008, 13:35:38 UTC | bash: remove dashed command leftovers Commit 5a625b07 (bash: remove fetch, push, pull dashed form leftovers, 2008-10-03) did that already, but there were still some git-cmd left here and there. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 November 2008, 02:29:53 UTC |
| b21a226 | Junio C Hamano | 27 November 2008, 21:18:25 UTC | Merge branch 'pw/maint-p4' into maint * pw/maint-p4: git-p4: fix keyword-expansion regex | 27 November 2008, 21:18:25 UTC |
| 3d51c85 | Pete Wyckoff | 26 November 2008, 18:52:15 UTC | git-p4: fix keyword-expansion regex This text: my $dir = $File::Find::dir; return if ($dir !~ m,$options->{dirpat}$,); was improperly converted to: my $dir = $File$dir !~ m,$options->{dirpat}$,); by the keyword identifier expansion code. Add a \n to make sure the regex doesn't go across end-of-line boundaries. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2008, 21:17:58 UTC |
| 76bac89 | Ralf Wildenhues | 27 November 2008, 07:32:01 UTC | Fix typos in the documentation. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2008, 09:17:23 UTC |
| c0a4ae5 | Junio C Hamano | 27 November 2008, 09:17:09 UTC | Merge branch 'rw/maint-typofix' into rw/typofix * rw/maint-typofix: Fix typos in the documentation. | 27 November 2008, 09:17:09 UTC |
| a0178ae | Ralf Wildenhues | 27 November 2008, 07:32:01 UTC | Fix typos in the documentation. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 November 2008, 09:00:45 UTC |
| 6249067 | Nanako Shiraishi | 26 November 2008, 10:21:44 UTC | git-gui: update Japanese translation Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> | 26 November 2008, 22:13:30 UTC |
| aa14a0c | Junio C Hamano | 26 November 2008, 19:57:31 UTC | Merge branch 'maint' * maint: Teach "git diff" to honour --[no-]ext-diff | 26 November 2008, 19:57:31 UTC |
| 78a0014 | Junio C Hamano | 26 November 2008, 19:57:28 UTC | Merge branch 'mm/sort-config-doc' * mm/sort-config-doc: config.txt: alphabetize configuration sections | 26 November 2008, 19:57:28 UTC |
| 5aa3bdd | Junio C Hamano | 26 November 2008, 19:57:15 UTC | Merge branch 'mm/maint-sort-config-doc' into maint * mm/maint-sort-config-doc: config.txt: alphabetize configuration sections | 26 November 2008, 19:57:15 UTC |
