a95148d | Junio C Hamano | 04 March 2009, 07:02:16 UTC | GIT 1.6.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 07:37:19 UTC |
a1070d4 | Mike Ralphson | 03 March 2009, 19:29:22 UTC | Documentation: Typo / spelling / formatting fixes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:43:19 UTC |
5a4aaaf | Mike Ralphson | 03 March 2009, 19:29:21 UTC | Documentation: Expand a couple of abbreviations These may not be obvious to non-native English speakers Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:42:44 UTC |
c0bc2ee | Mike Ralphson | 03 March 2009, 19:29:20 UTC | Documentation: Typos / spelling fixes in RelNotes Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 05:40:36 UTC |
8d1b9d2 | Roy Lee | 03 March 2009, 16:49:29 UTC | Documentation/git-archive.txt: Note attributes Signed-off-by: Roy Lee <roylee17@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2009, 04:16:49 UTC |
1d035f8 | David J. Mellor | 02 March 2009, 06:42:44 UTC | Documentation: minor grammatical fixes. The final hunk in this patch corrects what appears to be a typo: of --> or Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:56 UTC |
a7d64b5 | David J. Mellor | 02 March 2009, 06:38:36 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:54 UTC |
07f5746 | David J. Mellor | 02 March 2009, 06:37:41 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 20:34:53 UTC |
2559bff | Johannes Sixt | 01 March 2009, 10:20:03 UTC | t3400-rebase: Move detached HEAD check earlier Short story: There is a section in t3400 that tests fundamental rebase properties. 3ec7371f (Add two extra tests for git rebase, 2009-02-09) added a check that rebase works on a detached HEAD, but the test was put near the end of the file. This moves it to a more suitable place. Long story: The test that preceded the one in question tests that a rebased commit degrades from a content change with mode change to a mere mode change. But on Windows, where we have core.filemode=false, the original commit did not record the mode change, and so the rebase operation did not rebase anything. This caused the subsequent detached HEAD test to fail. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2009, 07:58:41 UTC |
f8c6288 | Junio C Hamano | 02 March 2009, 06:20:52 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Fix possible infinite loop and display corruption | 02 March 2009, 06:20:52 UTC |
52b8ea9 | Paul Mackerras | 01 March 2009, 22:38:17 UTC | gitk: Fix possible infinite loop and display corruption This fixes an issue reported by Johannes Sixt on the git mailing list: > This recipe sends gitk into an endless loop. In git.git do: > > cd t > # remove chmod a+x A near the end of the file > sed -i 's/chmod/: chmod/' t3400-rebase.sh > sh t3400-rebase.sh --debug > cd trash\ directory.t3400-rebase/ > gitk master modechange modechange@{1} > > > I briefly see the history chart, but the dot that should be modechange@{1} > is missing. One automatically selected commit is shown in the diff section > below. But then the commit list is cleared and gitk goes into an infinite > loop. > > Things work alright if either modechange@{1} is dropped, or the 'chmod' > line is left unchanged, which is a bit strange. > > This is with git version 1.6.1.2.390.gba743 There were actually two problems. This recipe created a situation where git log would output a child commit after its parent. This meant that we called fix_reversal which called splitvarc, which should call modify_arc to note the fact that it has modified the arc that it has just split. It wasn't, which meant that displayorder and other variables got into an inconsistent state (a commit appearing twice in displayorder). This then meant that the targetrow/targetid logic in drawvisible thought it need to redraw each time. That, together with the fact that drawvisible called drawcommits which called drawvisible if a redraw was needed, led to the infinite loop. In fact drawvisible is now the only caller of drawcommits. Thus, the start and end row arguments to drawcommits always encompass the whole visible area, so drawcommits doesn't need to call drawvisible to redraw; it just needs to clear the screen and draw what it's been asked to. This fixes these two problems by adding a call to modify_arc in splitvarc and by taking out the call to drawvisible in drawcommits. It also removes an unrelated left-over debugging puts in external_blame. Signed-off-by: Paul Mackerras <paulus@samba.org> | 01 March 2009, 22:38:17 UTC |
f474c52 | Junio C Hamano | 01 March 2009, 00:31:02 UTC | Merge branch 'jc/maint-1.6.0-pack-directory' * jc/maint-1.6.0-pack-directory: Fix odb_mkstemp() on AIX | 01 March 2009, 00:31:02 UTC |
12ef3d8 | Junio C Hamano | 28 February 2009, 22:39:56 UTC | Merge branch 'maint' * maint: Documentation: minor grammatical fixes. added missing backtick in git-apply.txt | 28 February 2009, 22:39:56 UTC |
dcc901b | David J. Mellor | 28 February 2009, 21:12:59 UTC | Documentation: minor grammatical fixes. Signed-off-by: David J. Mellor <dmellor@whistlingcat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 22:39:33 UTC |
325e9bc | Junio C Hamano | 28 February 2009, 22:05:09 UTC | Merge branch 'maint-1.6.0' into maint * maint-1.6.0: added missing backtick in git-apply.txt | 28 February 2009, 22:05:09 UTC |
eb006cc | Danijel Tasov | 28 February 2009, 20:03:54 UTC | added missing backtick in git-apply.txt Signed-off-by: Danijel Tasov <dt@korn.shell.la> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 21:10:16 UTC |
749485f | Todd Zullinger | 28 February 2009, 18:42:02 UTC | git-rebase: Update --whitespace documentation The parameters accepted by the --whitespace option of "git apply" have changed over time, and the documentation for "git rebase" was out of sync. Remove the specific parameter list from the "git rebase" documentation and simply point to the "git apply" documentation for details, as is already done in the "git am" documentation. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 19:47:25 UTC |
736e619 | Ben Walton | 28 February 2009, 03:11:45 UTC | git-svn - return original format_svn_date semantics When %z was removed from the strftime call and subsituted with a local gmt offset calculation, time() was no longer the default for all time functions as it was with the previous localtime(shift). This is now corrected so that format_svn_time behaves as it used to. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 05:53:43 UTC |
48679e5 | Eric Wong | 28 February 2009, 03:40:16 UTC | git-svn: disable broken symlink workaround by default Even though this will break things for some extremely rare repositories used by broken Windows clients, it's probably not worth enabling this by default as it has negatively affected many more users than it has helped from what we've seen so far. The extremely rare repositories that have broken symlinks in them will be silently corrupted in import; but users can still reenable this option and restart the import. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2009, 05:53:09 UTC |
48fce93 | Junio C Hamano | 28 February 2009, 00:00:33 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' * cc/maint-1.6.0-bisect-fix: bisect: fix another instance of eval'ed string Conflicts: git-bisect.sh | 28 February 2009, 00:00:33 UTC |
cce074a | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix another instance of eval'ed string When there is nothing to be skipped, the output from rev-list --bisect-vars was eval'ed without first being strung together with &&; this is probably not a problem as it is much less likely to be a bad input than the list handcrafted by the filter_skip function, but it still is a good discipline. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 22:30:34 UTC |
0c34735 | Junio C Hamano | 27 February 2009, 09:03:21 UTC | Merge branch 'cc/maint-1.6.0-bisect-fix' * cc/maint-1.6.0-bisect-fix: bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped Conflicts: git-bisect.sh | 27 February 2009, 09:03:21 UTC |
1b249ff | Christian Couder | 27 February 2009, 06:31:22 UTC | bisect: fix quoting TRIED revs when "bad" commit is also "skip"ped When the "bad" commit was also "skip"ped and when more than one commit was skipped, the "filter_skipped" function would have printed something like: bisect_rev=<hash1>|<hash2> (where <hash1> and <hash2> are hexadecimal sha1 hashes) and this would have been evaled later as piping "bisect_rev=<hash1>" into "<hash2>", which would have failed. So this patch makes the "filter_skipped" function properly quote what it outputs, so that it will print something like: bisect_rev='<hash1>|<hash2>' which will be properly evaled later. The caller was not stopping properly because the scriptlet this function returned to be evaled was not strung together with && and because of this, an error in an earlier part of the output was simply ignored. A test case is added to the test suite. And while at it, we also initialize the VARS, FOUND and TRIED variables, so that we protect ourselves from environment variables the user may have with these names. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 08:57:28 UTC |
2d56a13 | Junio C Hamano | 26 February 2009, 19:24:29 UTC | git-am: make --abort less dangerous When you are in the middle of "git rebase", "git am --abort" by mistake would have referred to nonexistent ORIG_HEAD and barfed, or worse yet, used a stale ORIG_HEAD and taken you to an unexpected commit. Also the option parsing did not reject "git am --abort --skip". Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 07:06:38 UTC |
c767184 | Michael J Gruber | 26 February 2009, 09:52:53 UTC | git-am: Keep index in case of abort with dirty index git am --abort resets the index unconditionally. But in case a previous git am exited due to a dirty index it is preferable to keep that index. Make it so. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 07:06:27 UTC |
2591838 | Jay Soffian | 26 February 2009, 23:44:40 UTC | t5540-http-push.sh: avoid non-portable grep -P OS X's GNU grep does not support -P/--perl-regexp. We use a basic RE instead, and simplify the pattern slightly by replacing '+' with '*' so it can be more easily expressed using a basic RE. The important part of pattern, checking for a SHA-1 has suffix in the successful PUT/MOVE operations, remains the same. Also, a-z instead of a-f was an obvious mistake in the original RE. Here are samples of what we want to match: 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "PUT /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 127.0.0.1 - - [26/Feb/2009:22:38:13 +0000] "MOVE /test_repo.git/objects/3e/a4fbb9e18a401a6463c595d08118fcb9fb7426_fab55116904c665a95438bcc78521444a7db6096 HTTP/1.1" 201 277 Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2009, 00:20:58 UTC |
2c626e5 | Mike Ralphson | 26 February 2009, 15:31:52 UTC | Fix odb_mkstemp() on AIX The AIX mkstemp() modifies its template parameter to an empty string if the call fails. The existing code had already recomputed the template, but too late to be good. See also 6ff6af62, which fixed this problem in a different spot. Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 February 2009, 16:40:27 UTC |
661763a | Junio C Hamano | 25 February 2009, 22:50:52 UTC | GIT 1.6.2-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 22:50:52 UTC |
bb0cebd | Junio C Hamano | 25 February 2009, 22:48:30 UTC | Merge branch 'jc/maint-1.6.0-pack-directory' * jc/maint-1.6.0-pack-directory: Make sure objects/pack exists before creating a new pack | 25 February 2009, 22:50:05 UTC |
6e180cd | Junio C Hamano | 25 February 2009, 07:11:29 UTC | Make sure objects/pack exists before creating a new pack In a repository created with git older than f49fb35 (git-init-db: create "pack" subdirectory under objects, 2005-06-27), objects/pack/ directory is not created upon initialization. It was Ok because subdirectories are created as needed inside directories init-db creates, and back then, packfiles were recent invention. After the said commit, new codepaths started relying on the presense of objects/pack/ directory in the repository. This was exacerbated with 8b4eb6b (Do not perform cross-directory renames when creating packs, 2008-09-22) that moved the location temporary pack files are created from objects/ directory to objects/pack/ directory, because moving temporary to the final location was done carefully with lazy leading directory creation. Many packfile related operations in such an old repository can fail mysteriously because of this. This commit introduces two helper functions to make things work better. - odb_mkstemp() is a specialized version of mkstemp() to refactor the code and teach it to create leading directories as needed; - odb_pack_keep() refactors the code to create a ".keep" file while create leading directories as needed. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 22:39:42 UTC |
69707d6 | Jay Soffian | 25 February 2009, 08:28:15 UTC | Allow HTTP tests to run on Darwin This patch allows the HTTP tests to run on OS X 10.5. It is not sufficient to be able to pass in LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH alone, as the apache.conf also needs a couple tweaks. These changes are put into an <IfDefine> to keep them Darwin specific, but this means lib-httpd.sh needs to be modified to pass -DDarwin to apache when running on Darwin. As long as we're making this change to lib-httpd.sh, we may as well set LIB_HTTPD_PATH and LIB_HTTPD_MODULE_PATH to appropriate default values for the platform. Note that we now pass HTTPD_PARA to apache at shutdown as well. Otherwise apache will emit a harmless, but noisy warning that LogFormat is an unknown directive. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 21:58:57 UTC |
3dbe116 | Michael J Gruber | 25 February 2009, 14:05:17 UTC | Fix typo in contrib/examples/git-svnimport.txt Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 16:33:14 UTC |
3f74c8e | Johannes Sixt | 25 February 2009, 07:54:42 UTC | gitattributes.txt: Path matching rules are explained in gitignore.txt The rules how the patterns are matched against path names are the same for .gitattribute and .gitignore files. This also replace the notion "glob pattern" by "pattern" because gitignore.txt talks about "glob" only in some contexts where the pattern is mentioned. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
a9d98a1 | Felipe Contreras | 24 February 2009, 21:59:05 UTC | sha1_file.c: fix typo it's != its Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
9ccb3bc | Felipe Contreras | 24 February 2009, 21:59:03 UTC | git add: trivial codestyle cleanup Global static variables don't need to be initialized to 0/NULL. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
aa98eb3 | Christian Couder | 24 February 2009, 20:16:37 UTC | README: fix path to "gitcvs-migration.txt" and be more consistent README suggested to look at "Documentation/gittutorial.txt" for the tutorial and to use "man git-commandname" for documentation of each command. This was not consistent because the tutorial can also be available with "man gittutorial" once git is installed, and the documentation for each command can be available at "Documentation/git-commandname.txt" before installing git. This patch tries to make the description more consistent. It also fixes the path to the cvs-migration documentation that changed from "Documentation/cvs-migration.txt" to "Documentation/gitcvs-migration.txt". Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:54 UTC |
a8fdab0 | Allan Caffee | 25 February 2009, 01:22:20 UTC | trace: Fixed a minor typo in an error message. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:53 UTC |
149f6dd | Marc Branchaud | 19 February 2009, 17:39:47 UTC | Docs: Expand explanation of the use of + in git push refspecs. Signed-off-by: Marc Branchaud <marcnarc@xiplink.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:53 UTC |
6ab149e | Gerrit Pape | 24 February 2009, 09:00:06 UTC | git-quiltimport: preserve standard input to be able to read user input When run without --author and it fails to determine an author, git quiltimport tries `read patch_author` to get user input, but standard input has been redirected to the patch series file. This commit lets quiltimport read the series file through file descriptor 3 so that the standard input is preserved. Reported by Uwe Kleine-König through http://bugs.debian.org/515910 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 08:49:13 UTC |
6a0861a | Gerrit Pape | 24 February 2009, 08:58:16 UTC | Install builtins with the user and group of the installing personality If 'make install' was run with sufficient privileges, then the installed builtins in gitexecdir, which are either hardlinked, symlinked, or copied, would receive the user and group of whoever built git. With this commit the initial hardlink or copy is done from the installation tree and not the build tree to fix this. Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 05:46:31 UTC |
48b6026 | Junio C Hamano | 25 February 2009, 05:13:32 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn fix to avoid using strftime %z | 25 February 2009, 05:13:32 UTC |
3ca9364 | Abhijit Menon-Sen | 25 February 2009, 03:03:14 UTC | Convert git-* invocations to "git *" in the svnimport example. After these changes, git-svnimport worked fine for me. Signed-off-by: Abhijit Menon-Sen <ams@toroid.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2009, 05:10:57 UTC |
e871784 | Ben Walton | 24 February 2009, 19:44:49 UTC | git-svn fix to avoid using strftime %z %z isn't available on all platforms in the date formatting routines. Provide a workalike capability that should be more portable. Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Acked-by: Eric Wong <normalperson@yhbt.net> | 24 February 2009, 21:45:36 UTC |
d43c07b | Junio C Hamano | 24 February 2009, 03:14:13 UTC | Merge git://git.bogomips.org/git-svn * git://git.bogomips.org/git-svn: git-svn: read the dcommit url from the config file on a per remote basis git-svn: fix delete+add branch tracking with empty files git-svn: Create leading directories in create-ignore | 24 February 2009, 03:14:13 UTC |
b4b0ba0 | Pete Wyckoff | 18 February 2009, 18:12:14 UTC | git-p4: avoid syncing duplicate changes When a particular changeset affects multiple depot paths, it will appear multiple times in the output of "p4 changes". Filter out the duplicates to avoid the extra empty commits that this otherwise would create. Signed-off-by: Pete Wyckoff <pw@padd.com> Acked-by: Simon Hausmann <simon@lst.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2009, 23:24:08 UTC |
0df8405 | Peter Oberndorfer | 23 February 2009, 11:02:53 UTC | git-svn: read the dcommit url from the config file on a per remote basis The commit url for dcommit is determined in the following order: commandline option --commit-url svn.commiturl svn-remote.<name>.commiturl svn-remote.<name>.url Signed-off-by: Peter Oberndorfer <kumbayo84@arcor.de> Acked-by: Eric Wong <normalperson@yhbt.net> | 23 February 2009, 21:50:24 UTC |
83c2fcf | Eric Wong | 23 February 2009, 04:25:00 UTC | git-svn: fix delete+add branch tracking with empty files Original bug report and test case by Björn Steinbrink. Björn Steinbrink <B.Steinbrink@gmx.de> wrote: > Hi Eric, > > seems that the empty symlink stuff gets confused about which revision to > use when looking for the parent's file. > > r3 = f1a6fcf6b0a1c4a373d0b2b65a3d70700084f361 (tags/1.0.1) > Found possible branch point: file:///home/doener/h/svn/tags/1.0 => file:///home/doener/h/svn/branches/1.0, 4 > Found branch parent: (1.0) 63ae640ba01014ecbb3df590999ed1fa5914545b > Following parent with do_switch > Successfully followed parent > r5 = 26fcfef5bcced97ab74faf1af7341a2ae0d272aa (1.0) > Found possible branch point: file:///home/doener/h/svn/branches/1.0 => file:///home/doener/h/svn/tags/1.0.1, 5 > Found branch parent: (tags/1.0.1) 26fcfef5bcced97ab74faf1af7341a2ae0d272aa > Following parent with do_switch > Scanning for empty symlinks, this may take a while if you have many empty files > You may disable this with `git config svn.brokenSymlinkWorkaround false'. > This may be done in a different terminal without restarting git svn > Filesystem has no item: File not found: revision 3, path '/branches/1.0/file' at /usr/local/libexec/git-core/git-svn line 3318 > > Note how it tries to look at revision 3 instead of revision 5 (which it > correctly detected as the parent). The import succeeds when > svn.brokenSymlinkWorkaround is set to false. Testcase below. Signed-off-by: Eric Wong <normalperson@yhbt.net> | 23 February 2009, 04:31:08 UTC |
7d9fd45 | Brian Gernhardt | 19 February 2009, 18:08:04 UTC | git-svn: Create leading directories in create-ignore Since SVN tracks empty directories and git does not, we can not assume that the directory exists when creating .gitignore files. Signed-off-by: Brian Gernhardt <benji@silverinsanity.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 23 February 2009, 04:30:58 UTC |
2d602e9 | Junio C Hamano | 21 February 2009, 18:38:04 UTC | Merge branch 'for-junio' of git://source.winehq.org/~julliard/git/git * 'for-junio' of git://source.winehq.org/~julliard/git/git: Add a README in the contrib/emacs directory. git.el: Improve the confirmation message on remove and revert. git.el: Make sure that file lists are sorted as they are created. | 21 February 2009, 18:38:04 UTC |
6f3c504 | Alexandre Julliard | 16 February 2009, 10:40:29 UTC | Add a README in the contrib/emacs directory. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 21 February 2009, 12:57:53 UTC |
5b4e441 | Alexandre Julliard | 16 February 2009, 10:40:08 UTC | git.el: Improve the confirmation message on remove and revert. If there's only one file, print its name instead of just "1 file". Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 21 February 2009, 12:49:44 UTC |
21ba0e8 | Alexandre Julliard | 16 February 2009, 10:39:11 UTC | git.el: Make sure that file lists are sorted as they are created. This avoids a possibly redundant sort in git-update-status-files and git-status-filenames-map, and allows callers to continue using the list without having to copy it. It also fixes the confusing success messages reported by Brent Goodrick. Signed-off-by: Alexandre Julliard <julliard@winehq.org> | 21 February 2009, 12:49:36 UTC |
7dff9b3 | Linus Torvalds | 20 February 2009, 22:15:22 UTC | Support 'raw' date format Talking about --date, one thing I wanted for the 1234567890 date was to get things in the raw format. Sure, you get them with --pretty=raw, but it felt a bit sad that you couldn't just ask for the date in raw format. So here's a throw-away patch (meaning: I won't be re-sending it, because I really don't think it's a big deal) to add "--date=raw". It just prints out the internal raw git format - seconds since epoch plus timezone (put another way: 'date +"%s %z"' format) Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2009, 05:45:42 UTC |
8c5b85c | Junio C Hamano | 20 February 2009, 07:44:07 UTC | Merge branch 'maint' * maint: More friendly message when locking the index fails. Document git blame --reverse. Documentation: Note file formats send-email accepts | 20 February 2009, 07:44:07 UTC |
e43a6fd | Matthieu Moy | 19 February 2009, 12:54:18 UTC | More friendly message when locking the index fails. Just saying that index.lock exists doesn't tell the user _what_ to do to fix the problem. We should give an indication that it's normally safe to delete index.lock after making sure git isn't running here. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2009, 07:22:57 UTC |
b452cc1 | Matthieu Moy | 19 February 2009, 12:34:48 UTC | Document git blame --reverse. This was introduced in 85af7929ee125385c2771fa4eaccfa2f29dc63c9 but not documented outside the commit message. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2009, 07:22:18 UTC |
7d233de | Marcel M. Cary | 18 February 2009, 03:00:43 UTC | gitweb: Hyperlink multiple git hashes on the same commit message line The current implementation only hyperlinks the first hash on a given line of the commit message. It seems sensible to highlight all of them if there are multiple, and it seems plausible that there would be multiple even with a tidy line length limit, because they can be abbreviated as short as 8 characters. Benchmark: I wanted to make sure that using the 'e' switch to the Perl regex wasn't going to kill performance, since this is called once per commit message line displayed. In all three A/B scenarios I tried, the A and B yielded the same results within 2%, where A is the version of code before this patch and B is the version after. 1: View a commit message containing the last 1000 commit hashes 2: View a commit message containing 1000 lines of 40 dots to avoid hyperlinking at the same message length 3: View a short merge commit message with a few lines of text and no hashes All were run in CGI mode on my sub-production hardware on a recent clone of git.git. Numbers are the average of 10 reqests per second with the first request discarded, since I expect this change to affect primarily CPU usage. Measured with ApacheBench. Note that the web page rendered was the same; while the new code supports multiple hashes per line, there was at most one per line. The primary purpose of scenarios 2 and 3 were to verify that the addition of 1000 commit messages had an impact on how much of the time was spent rendering commit messages. They were all within 2% of 0.80 requests per second (much faster). So I think the patch has no noticeable effect on performance. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2009, 06:49:55 UTC |
024aa7d | Johannes Schindelin | 19 February 2009, 19:10:53 UTC | system_path(): simplify using strip_path_suffix(), and add suffix "git" At least for the author of this patch, the logic in system_path() was too hard to understand. Using the function strip_path_suffix() documents the idea of the code better. The real change is to add the suffix "git", so that a runtime prefix will be computed correctly even when the executable was called in /git/ as is the case in msysGit (Windows insists to search the current directory before the PATH when looking for an executable). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2009, 06:47:39 UTC |
4fcc86b | Johannes Schindelin | 19 February 2009, 19:10:49 UTC | Introduce the function strip_path_suffix() The function strip_path_suffix() will try to strip a given suffix from a given path. The suffix must start at a directory boundary (i.e. "core" is not a path suffix of "libexec/git-core", but "git-core" is). Arbitrary runs of directory separators ("slashes") are assumed identical. Example: strip_path_suffix("C:\\msysgit/\\libexec\\git-core", "libexec///git-core", &prefix) will set prefix to "C:\\msysgit" and return 0. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2009, 06:45:48 UTC |
c4ba87a | Todd Zullinger | 19 February 2009, 03:51:06 UTC | Documentation: Note file formats send-email accepts Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2009, 06:15:29 UTC |
25487f8 | Junio C Hamano | 18 February 2009, 19:31:52 UTC | Merge branch 'maint' * maint: tests: fix "export var=val" Skip timestamp differences for diff --no-index Documentation/git-push: --all, --mirror, --tags can not be combined | 18 February 2009, 19:31:52 UTC |
91e80b9 | Junio C Hamano | 18 February 2009, 19:17:27 UTC | tests: fix "export var=val" Some shells do not like "export var=val"; the right way to write it is to do an assignment and then export just the variable name. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 19:17:27 UTC |
88e3880 | Lars Noschinski | 18 February 2009, 08:35:36 UTC | filter-branch -d: Export GIT_DIR earlier The improved error handling catches a bug in filter-branch when using -d pointing to a path outside any git repository: $ git filter-branch -d /tmp/foo master fatal: Not a git repository (or any of the parent directories): .git This error message comes from git for-each-ref in line 224. GIT_DIR is set correctly by git-sh-setup (to the foo.git repository), but not exported (yet). Signed-off-by: Lars Noschinski <lars@public.noschinski.de> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 19:15:17 UTC |
51b2ead | Jay Soffian | 18 February 2009, 13:44:02 UTC | disallow providing multiple upstream branches to rebase, pull --rebase It does not make sense to provide multiple upstream branches to either git pull --rebase, or to git rebase, so disallow both. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 19:14:04 UTC |
d61027b | Michael Spang | 18 February 2009, 06:48:06 UTC | Skip timestamp differences for diff --no-index We display empty diffs for files whose timestamps have changed. Usually, refreshing the index makes those empty diffs go away. However, when not using the index they are not very useful and there is no option to suppress them. This forces on the skip_stat_unmatch option for diff --no-index, suppressing any empty diffs. This option is also used for diffs against the index when "diff.autorefreshindex" is set, but that option does not apply to diff --no-index. Signed-off-by: Michael Spang <mspang@uwaterloo.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 18:55:33 UTC |
b94ead7 | Junio C Hamano | 18 February 2009, 18:48:01 UTC | git-svn: fix parsing of timestamp obtained from svn Ward Wouts reports that git-svn barfed like this: Unable to parse date: 2004-03-09T09:44:33.Z at /usr/bin/git-svn line 3995 The parse_svn_date sub expects there always are one or more digits after the decimal point to record fractional seconds, but this example does not and results in a failure like this. The fix is based on the original fix by the reporter, further cleaned up. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 18 February 2009, 18:48:01 UTC |
df5d10a | Marcel M. Cary | 18 February 2009, 13:09:41 UTC | gitweb: Fix warnings with override permitted but no repo override When a feature like "blame" is permitted to be overridden in the repository configuration but it is not actually set in the repository, a warning is emitted due to the undefined value of the repository configuration, even though it's a perfectly normal condition. Emitting warning is grounds for test failure in the gitweb test script. This error was caused by rewrite of git_get_project_config from using "git config [<type>] <name>" for each individual configuration variable checked to parsing "git config --list --null" output in commit b201927 (gitweb: Read repo config using 'git config -z -l'). Earlier version of git_get_project_config was returning empty string if variable do not exist in config; newer version is meant to return undef in this case, therefore change in feature_bool was needed. Additionally config_to_* subroutines were meant to be invoked only if configuration variable exists; therefore we added early return to git_get_project_config: it now returns no value if variable does not exists in config. Otherwise config_to_* subroutines (config_to_bool in paryicular) wouldn't be able to distinguish between the case where variable does not exist and the case where variable doesn't have value (the "[section] noval" case, which evaluates to true for boolean). While at it fix bug in config_to_bool, where checking if $val is defined (if config variable has value) was done _after_ stripping leading and trailing whitespace, which lead to 'Use of uninitialized value' warning. Add test case for features overridable but not overriden in repo config, and case for no value boolean configuration variable. Signed-off-by: Marcel M. Cary <marcel@oak.homeunix.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 18:43:21 UTC |
bed5122 | Gerrit Pape | 17 February 2009, 09:25:02 UTC | Documentation/git-push: --all, --mirror, --tags can not be combined While b259f09 made git-push output a better error message for 'git-push --all --tags', this commit fixes the synopsis in the documentation. Inconsistency spotted and fix suggested by Jari Aalto through http://bugs.debian.org/502567 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 18:42:33 UTC |
bf3c20f | Thomas Rast | 16 February 2009, 16:34:57 UTC | bash completion: only show 'log --merge' if merging The gitk completion only shows --merge if MERGE_HEAD is present. Do it the same way for git-log completion. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 18:41:45 UTC |
a393777 | Thomas Rast | 16 February 2009, 16:34:56 UTC | bash completion: refactor common log, shortlog and gitk options Refactor options that are useful for more than one of them into a variable used by the relevant completions. This has the effect of adding the following options to git-log: --branches --tags --remotes --first-parent --dense --sparse --simplify-merges --simplify-by-decoration --first-parent --no-merges The following to git-shortlog: --branches --tags --remotes --first-parent And the following to gitk: --branches --tags --remotes --first-parent --no-merges --max-count= --max-age= --since= --after= --min-age= --until= --before= --dense --sparse --full-history --simplify-merges --simplify-by-decoration --left-right Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2009, 18:41:37 UTC |
81d3fe9 | Giuseppe Bilotta | 15 February 2009, 09:18:36 UTC | gitweb: fix wrong base URL when non-root DirectoryIndex CGI::url() has some issues when rebuilding the script URL if the script is a DirectoryIndex. One of these issue is the inability to strip PATH_INFO, which is why we had to do it ourselves. Another issue is that the resulting URL cannot be used for the <base> tag: it works if we're the DirectoryIndex at the root level, but not otherwise. We fix this by building the proper base URL ourselves, and improve the comment about the need to strip PATH_INFO manually while we're at it. Additionally t/t9500-gitweb-standalone-no-errors.sh had to be modified to set SCRIPT_NAME variable (CGI standard states that it MUST be set, and now gitweb uses it if PATH_INFO is not empty, as is the case for some of tests in t9500). Signed-off-by: Giuseppe Bilotta <giuseppe.bilotta@gmail.com> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2009, 00:19:07 UTC |
4a5856c | SZEDER Gábor | 14 February 2009, 16:21:53 UTC | bash: update 'git svn' options 'git svn' got some new subcommands and otions in the last couple of months. This patch adds completion support for them. In particular: * 'fetch', 'clone', etc.: '--ignore-paths=' * 'init' and 'clone': '--prefix=', '--use-log-author', '--add-author-from' * 'dcommit': '--commit-url', '--revision' * 'log': '--color' * 'rebase': '--dry-run' * 'branch', 'tag', 'blame', 'migrate' subcommands and their options 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> | 16 February 2009, 22:53:06 UTC |
d532ebd | SZEDER Gábor | 15 February 2009, 13:25:11 UTC | bash: add missing 'git merge' options Namely: '--commit', '--stat', '--no-squash', '--ff', '--no-ff'. One might wonder why add options that specify the default behaviour anyway (e.g. '--commit', '--no-squash', etc.). Users can override the default with config options (e.g. 'branch.<name>.mergeoptions', 'merge.log'), but sometimes might still need the default behaviour. 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> | 16 February 2009, 22:51:24 UTC |
1b7e543 | Dévai Tamás | 11 February 2009, 23:14:02 UTC | git-svn: Fix for rewriteRoot URL containing username. If the new svn root URL given with the svn-remote.<repo>.rewriteRoot config option (or by the --rewrite-root option to 'git svn init') contains a username (such as 'svn+ssh://username@example.com/repo'), find_by_url() cannot find the repository URL, because the URL contained in the commit message does have the username removed. Signed-off-by: Dévai Tamás <devait@mailbox.sk> Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2009, 02:04:48 UTC |
88a667f | René Scharfe | 15 February 2009, 18:18:58 UTC | builtin-receive-pack.c: fix compiler warnings about format string While all of the strings passed to warning() are, in fact, literals, the compiler doesn't recognize them as such because it doesn't see through the loop used to iterate over them: builtin-receive-pack.c: In function 'warn_unconfigured_deny': builtin-receive-pack.c:247: warning: format not a string literal and no format arguments builtin-receive-pack.c: In function 'warn_unconfigured_deny_delete_current': builtin-receive-pack.c:273: warning: format not a string literal and no format arguments Calm the compiler by adding easily recognizable format string literals. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 19:14:12 UTC |
075394e | Junio C Hamano | 15 February 2009, 08:15:52 UTC | RelNotes Update Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 09:49:13 UTC |
f7a2bdb | Junio C Hamano | 15 February 2009, 09:44:58 UTC | Merge branch 'mc/setup-cd-p' * mc/setup-cd-p: git-sh-setup: Use "cd" option, not /bin/pwd, for symlinked work tree | 15 February 2009, 09:44:58 UTC |
7b83a92 | Junio C Hamano | 15 February 2009, 09:44:20 UTC | Merge branch 'ff/submodule-no-fetch' * ff/submodule-no-fetch: submodule: add --no-fetch parameter to update command | 15 February 2009, 09:44:20 UTC |
160d2bc | Junio C Hamano | 15 February 2009, 09:44:15 UTC | Merge branch 'ms/mailmap' * ms/mailmap: Move mailmap documentation into separate file Change current mailmap usage to do matching on both name and email of author/committer. Add map_user() and clear_mailmap() to mailmap Add find_insert_index, insert_at_index and clear_func functions to string_list Add mailmap.file as configurational option for mailmap location | 15 February 2009, 09:44:15 UTC |
2a8644c | Junio C Hamano | 15 February 2009, 09:44:11 UTC | Merge branch 'jn/gitweb-committag' * jn/gitweb-committag: gitweb: Better regexp for SHA-1 committag match | 15 February 2009, 09:44:11 UTC |
c42b04b | Junio C Hamano | 15 February 2009, 09:43:57 UTC | Merge branch 'rc/http-push' * rc/http-push: use a hash of the lock token as the suffix for PUT/MOVE | 15 February 2009, 09:43:57 UTC |
dfab7c1 | Tay Ray Chuan | 14 February 2009, 09:52:14 UTC | use a hash of the lock token as the suffix for PUT/MOVE After 753bc91 ("Remove the requirement opaquelocktoken uri scheme"), lock tokens are in the URI forms in which they are received from the server, eg. 'opaquelocktoken:', 'urn:uuid:'. However, "start_put" (and consequently "start_move"), which attempts to create a unique temporary file using the UUID of the lock token, inadvertently uses the lock token in its URI form. These file operations on the server may not be successful (specifically, in Windows), due to the colon ':' character from the URI form of the lock token in the file path. This patch uses a hash of the lock token instead, guaranteeing only "safe" characters (a-f, 0-9) are used in the file path. The token's hash is generated when the lock token is received from the server in handle_new_lock_ctx, minimizing the number of times of hashing. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 08:57:43 UTC |
43e35f6 | Junio C Hamano | 15 February 2009, 08:05:11 UTC | Merge branch 'js/gc-prune' * js/gc-prune: gc: make --prune useful again by accepting an optional parameter | 15 February 2009, 08:05:11 UTC |
b43174e | Junio C Hamano | 15 February 2009, 08:03:43 UTC | Merge branch 'tr/abbrev-commit-no-ellipses' * tr/abbrev-commit-no-ellipses: log: do not print ellipses with --abbrev-commit | 15 February 2009, 08:03:43 UTC |
472e474 | Junio C Hamano | 15 February 2009, 08:03:29 UTC | Merge branch 'jc/branch-previous' * jc/branch-previous: Teach @{-1} to git merge Teach the "@{-1} syntax to "git branch" | 15 February 2009, 08:03:29 UTC |
48c9ab7 | SZEDER Gábor | 14 February 2009, 16:21:52 UTC | bash: fix misspelled 'git svn' option '--user-log-author' -> '--use-log-author' Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 05:31:16 UTC |
db7fee8 | SZEDER Gábor | 14 February 2009, 16:16:29 UTC | t1500: more 'git rev-parse --git-dir' tests Extend t1500 with tests of 'git rev-parse --git-dir' when invoked from other directories of the repository or the work tree. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 05:29:50 UTC |
8fb3c00 | SZEDER Gábor | 14 February 2009, 16:16:28 UTC | Move 'rev-parse --git-dir' test to t1500 Commit 72183cb2 (Fix gitdir detection when in subdir of gitdir, 2009-01-16) added a test to 't1501-worktree' to check the behaviour of 'git rev-parse --git-dir' in a special case. However, t1501 is about testing separate work tree setups, and not about basic 'rev-parse' functionality, which is tested in t1500-rev-parse. Therefore, this patch moves that test to t1500. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 05:29:46 UTC |
d0268de | Thomas Rast | 14 February 2009, 20:56:51 UTC | Documentation: pruning recipe for destructive filter-branch Add a section about how to shrink a repository's size after running git-filter-branch to remove large blobs from history. This comes up every week or so on IRC, and the commands required to handle every case are not very newbie-friendly, so hopefully writing them down somewhere leads to fewer questions. It may seem contradictory to document fallbacks for older Gits in newer docs, but we want to point people at this as a FAQ answer, and they will frequently not have the newest version installed. Thanks to Björn Steinbrink and Junio C Hamano for comments and corrections. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 05:18:54 UTC |
58e9d9d | Johannes Schindelin | 14 February 2009, 22:10:10 UTC | gc: make --prune useful again by accepting an optional parameter With this patch, "git gc --no-prune" will not prune any loose (and dangling) object, and "git gc --prune=5.minutes.ago" will prune all loose objects older than 5 minutes. This patch benefitted from suggestions by Thomas Rast and Jan Krï¿œger. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2009, 05:14:07 UTC |
c9717ee | Junio C Hamano | 14 February 2009, 07:26:12 UTC | Teach @{-1} to git merge 1.6.2 will have @{-1} syntax advertised as "usable anywhere you can use a branch name". However, "git merge @{-1}" did not work. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2009, 07:46:42 UTC |
8415d5c | Junio C Hamano | 14 February 2009, 07:08:05 UTC | Teach the "@{-1} syntax to "git branch" This teaches the new "@{-1} syntax to refer to the previous branch to "git branch". After looking at somebody's faulty patch series on a topic branch too long, if you decide it is not worth merging, you can just say: $ git checkout master $ git branch -D @{-1} to get rid of it without having to type the name of the topic you now hate so much for wasting a lot of your time. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2009, 07:46:28 UTC |
e9cc02f | Jeff King | 13 February 2009, 18:26:09 UTC | symbolic-ref: allow refs/<whatever> in HEAD Commit afe5d3d5 introduced a safety valve to symbolic-ref to disallow installing an invalid HEAD. It was accompanied by b229d18a, which changed validate_headref to require that HEAD contain a pointer to refs/heads/ instead of just refs/. Therefore, the safety valve also checked for refs/heads/. As it turns out, topgit is using refs/top-bases/ in HEAD, leading us to re-loosen (at least temporarily) the validate_headref check made in b229d18a. This patch does the corresponding loosening for the symbolic-ref safety valve, so that the two are in agreement once more. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2009, 02:20:44 UTC |
4b15b4a | Keith Cascio | 13 February 2009, 17:33:34 UTC | Remove redundant bit clears from diff_setup() All bits already clear after memset(0). Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2009, 02:19:37 UTC |
7fcda92 | Thomas Rast | 13 February 2009, 22:10:41 UTC | log: do not print ellipses with --abbrev-commit 'git log --abbrev-commit' added an ellipsis to all commit names that were abbreviated. This was particularly annoying if you wanted to cut&paste the sha1 from the terminal, since selecting by word would pick up '...' too. So use find_unique_abbrev() instead of diff_unique_abbrev() in all log-related commit sha1 printing routines, and also change the formatting of the 'Merge: parent1 parent2' line output via pretty_print_commit(). Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2009, 01:18:22 UTC |
901d615 | Matt Kraai | 12 February 2009, 15:55:54 UTC | bash-completion: Complete the values of color.interactive, color.ui, color.pager Signed-off-by: Matt Kraai <kraai@ftbfs.org> Acked-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2009, 17:55:45 UTC |
5cd12b8 | Junio C Hamano | 12 February 2009, 06:42:27 UTC | Install the default "master" branch configuration after cloning a void After "cloning from an empty repository", we have a configuration to describe the remote's URL and the default ref mappings, but we lack the branch configuration for the default branch we create on our end, "master". It is likely that the empty repository we cloned from will point the default "master" branch with its HEAD, so prepare the local configuration to match. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2009, 06:37:35 UTC |
1a526d4 | Jeremy White | 12 February 2009, 21:17:04 UTC | Update documentation to add further information about using Thunderbird with git-imap-send. Signed-off-by: Jeremy White <jwhite@codeweavers.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2009, 01:46:05 UTC |
7fe5438 | Mark Burton | 12 February 2009, 10:21:19 UTC | git-rebase.txt: --interactive does not work with --whitespace Signed-off-by: Mark Burton <markb@ordern.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2009, 00:50:28 UTC |
49bde75 | Jacob Helwig | 12 February 2009, 18:01:10 UTC | Add 'rm -f' equivalent to 'git rm' example of filter-branch --index-filter Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2009, 23:44:56 UTC |