| e53e6b4 | Brian Downing | 11 June 2010, 02:59:07 UTC | unpack-trees: Make index lookahead less pessimal When traversing trees with an index, the current index pointer (o->cache_bottom) occasionally has to be temporarily advanced forwards to match the traversal order of the tree, which is not the same as the sort order of the index. The existing algorithm that did this (introduced in 730f72840cc50c523fe4cdd796ea2d2fc4571a28) would get "stuck" when the cache_bottom was popped and then repeatedly check the same index entries over and over. This represents a serious performance regression for large repositories compared to the old "broken" traversal order. This commit makes a simple change to mitigate this. Whenever find_cache_pos sees that the current pos is also the cache_bottom, and it has already been unpacked, it advances the cache_bottom as well as the current pos. This prevents the above "sticking" behavior without dramatically changing the algorithm. In addition, this commit moves the unpacked check above the ce_in_traverse_path() check. The simple bitmask check is cheaper, and in the case described above will be firing quite a bit to advance the cache_bottom after a tree pop. This yields considerable performance improvements for large trees. The following are the number of function calls for "git diff HEAD" on the Linux kernel tree, with 33,307 files: Symbol Calls Before Calls After ------------------- ------------ ----------- unpack_callback 35,332 35,332 find_cache_pos 37,357 37,357 ce_in_traverse_path 4,979,473 37,357 do_compare_entry 6,828,181 251,925 df_name_compare 6,828,181 251,925 And on a repository of 187,456 files: Symbol Calls Before Calls After ------------------- ------------ ----------- unpack_callback 197,958 197,958 find_cache_pos 208,460 208,460 ce_in_traverse_path 37,308,336 208,460 do_compare_entry 156,950,469 2,690,626 df_name_compare 156,950,469 2,690,626 On the latter repository, user time for "git diff HEAD" was reduced from 5.58 to 0.42 seconds. This is compared to 0.30 seconds before the traversal order fix was implemented. Signed-off-by: Brian Downing <bdowning@lavos.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 June 2010, 15:06:18 UTC |
| 2543d9b | Tor Arntsen | 04 June 2010, 09:32:11 UTC | Change C99 comments to old-style C comments Signed-off-by: Tor Arntsen <tor@spacetec.no> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2010, 22:50:21 UTC |
| 3334729 | Jay Soffian | 06 June 2010, 23:31:34 UTC | commit.txt: clarify how --author argument is used commit --author was added by 146ea06 (git commit --author=$name: look $name up in existing commits), but its documentation was sorely lacking compared to its excellent commit message. This commit tries to improve the documentation. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 June 2010, 05:13:51 UTC |
| e1e5ec8 | Clemens Buchacher | 05 June 2010, 08:04:20 UTC | setup: document prefix Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 June 2010, 15:41:39 UTC |
| 761a889 | Gary V. Vaughan | 02 June 2010, 01:55:36 UTC | git-compat-util.h: use apparently more common __sgi macro to detect SGI IRIX IRIX 6.5.26m does not define the 'sgi' macro, but it does define an '__sgi' macro. Since later IRIX versions (6.5.29m) define both macros, and since an underscore prefixed macro is preferred anyway, use '__sgi' to detect compilation on SGI IRIX. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Gary V. Vaughan <gary@thewrittenword.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2010, 17:03:53 UTC |
| 873c347 | Michael J Gruber | 01 June 2010, 15:16:42 UTC | Documentation: A...B shortcut for checkout and rebase Describe the A...B shortcuts for checkout and rebase [-i] which were introduced in these commits: 619a64e ("checkout A...B" switches to the merge base between A and B, 2009-10-18) 61dfa1b ("rebase --onto A...B" replays history on the merge base between A and B, 2009-11-20) 230a456 (rebase -i: teach --onto A...B syntax, 2010-01-07) Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2010, 17:03:53 UTC |
| 41e4d69 | Nazri Ramliy | 01 June 2010, 17:54:46 UTC | Documentation/pretty-{formats,options}: better reference for "format:<string>" In "git help log" (and friends) it's not easy to find the possible placeholder for <string> for the "--pretty=format:<string>" option to git log. This patch makes the placeholder easier to find by adding a reference to the "PRETTY FORMATS" section and repeating the "format:<string>" phrase. Signed-off-by: Nazri Ramliy <ayiehere@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 June 2010, 17:03:53 UTC |
| 6774e2b | Junio C Hamano | 01 June 2010, 01:14:17 UTC | Merge branch 'maint-1.7.0' into maint * maint-1.7.0: Documentation/config: describe status.submodulesummary | 01 June 2010, 01:14:17 UTC |
| 811dd90 | Tim Henigan | 26 May 2010, 12:36:10 UTC | Documentation/SubmittingPatches: Fix typo in GMail section Commit e498257d introduced a typo while improving the GMail section of SubmittingPatches. Signed-off-by: Tim Henigan <tim.henigan@gmail.com> Acked-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 June 2010, 01:05:17 UTC |
| 4b2343f | Michael J Gruber | 20 May 2010, 15:55:42 UTC | Documentation/config: describe status.submodulesummary ac8d5af (builtin-status: submodule summary support, 2008-04-12) intoduced this variable and described it in git-status[1]. Include this description in git-config[1], as well. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 May 2010, 01:26:33 UTC |
| 371276b | Junio C Hamano | 28 May 2010, 23:59:36 UTC | Merge branch 'maint-1.7.0' into maint * maint-1.7.0: Makefile: reenable install with NO_CURL | 28 May 2010, 23:59:36 UTC |
| 70b89f8 | Michael J Gruber | 26 May 2010, 14:24:34 UTC | Makefile: reenable install with NO_CURL Setting NO_CURL leaves some variables like REMOTE_CURL_ALIASES empty, which creates no fun when for-looping over $(REMOTE_CURL_ALIASES) unconditionally. Make it conditional. Reported-by: Paul Walker <PWalker752@aol.com> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2010, 23:46:09 UTC |
| ff9c082 | Michael J Gruber | 26 May 2010, 08:46:41 UTC | completion: --set-upstream option for git-branch Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2010, 22:05:53 UTC |
| 490544b | Clemens Buchacher | 22 May 2010, 11:13:05 UTC | get_cwd_relative(): do not misinterpret suffix as subdirectory If the current working directory is the same as the work tree path plus a suffix, e.g. 'work' and 'work-xyz', then the suffix '-xyz' would be interpreted as a subdirectory of 'work'. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 May 2010, 22:02:50 UTC |
| e498257 | Michael J Gruber | 25 May 2010, 08:30:13 UTC | Documentation/SubmittingPatches: clarify GMail section and SMTP We keep getting mangled submissions from GMail's web interface. Try to be more proactive in SubmittingPatches by - pointing to MUA specific instructions early on, - structuring the GMail section more clearly, - putting send-email/SMTP before imap-send/IMAP. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2010, 17:50:58 UTC |
| bd7440f | Tay Ray Chuan | 24 May 2010, 08:50:44 UTC | show-branch: use DEFAULT_ABBREV instead of 7 Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2010, 16:48:49 UTC |
| e8f3016 | Tay Ray Chuan | 24 May 2010, 08:51:17 UTC | t7502-commit: fix spelling s/subdirecotry/subdirectory/ Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2010, 16:48:37 UTC |
| 4e1f879 | Clemens Buchacher | 22 May 2010, 12:21:27 UTC | test get_git_work_tree() return value for NULL If we are in a git directory, get_git_work_tree() can return NULL. While trying to determine whether or not the given paths are outside the work tree, the following command would read from it anyways and trigger a segmentation fault. git diff / / Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 May 2010, 16:28:51 UTC |
| c8b2964 | René Scharfe | 20 May 2010, 18:57:53 UTC | Fix checkout of large files to network shares on Windows XP Bigger writes to network drives on Windows XP fail. Cap them at 31MB to allow them to succeed. Callers need to be prepared for write() calls that do less work than requested anyway. On local drives, write() calls are translated to WriteFile() calls with a cap of 64KB on Windows XP and 256KB on Vista. Thus a cap of 31MB won't affect the number of WriteFile() calls which do the actual work. There's still room for some other version of Windows to use a chunk size of 1MB without increasing the number of system calls. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2010, 23:12:13 UTC |
| fc012c2 | bert Dvornik | 20 May 2010, 18:57:52 UTC | start_command: close cmd->err descriptor when fork/spawn fails Fix the problem where the cmd->err passed into start_command wasn't being properly closed when certain types of errors occurr. (Compare the affected code with the clean shutdown code later in the function.) On Windows, this problem would be triggered if mingw_spawnvpe() failed, which would happen if the command to be executed was malformed (e.g. a text file that didn't start with a #! line). If cmd->err was a pipe, the failure to close it could result in a hang while the other side was waiting (forever) for either input or pipe close, e.g. while trying to shove the output into the side band. On msysGit, this problem was causing a hang in t5516-fetch-push. [J6t: With a slight adjustment of the test case, the hang is also observed on Linux.] Signed-off-by: bert Dvornik <dvornik+git@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2010, 23:11:29 UTC |
| 60890cc | Ian McLean | 20 May 2010, 18:57:51 UTC | Fix "Out of memory? mmap failed" for files larger than 4GB on Windows The git_mmap implementation was broken for file sizes that wouldn't fit into a size_t (32 bits). This was caused by intermediate variables that were only 32 bits wide when they should be 64 bits. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2010, 23:11:06 UTC |
| cc24a1d | Jonathan Nieder | 19 May 2010, 19:01:47 UTC | post-receive-email: document command-line mode According to the default hooks/post-receive file, the hook is called with three arguments on stdin: <oldrev> <newrev> <refname> In command-line mode, the arguments come in a different order, because the email hook instead calls: generate_email $2 $3 $1 Add a comment to explain why, based on comments from the mailing list and the commit message to v1.5.1~9. Thanks to Andy for the explanation. Requested-by: martin f. krafft <madduck@debian.org> Cc: Andy Parkins <andyparkins@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 May 2010, 03:45:30 UTC |
| d07ef71 | Michael J Gruber | 18 May 2010, 10:49:33 UTC | Documentation/gitdiffcore: fix order in pickaxe description Reverse the order of "origin" and "result" so that the sentence really describes an addition rather than a removal. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2010, 04:55:11 UTC |
| f3838ce | Michael J Gruber | 13 May 2010, 12:51:38 UTC | Documentation: fix minor inconsistency While we don't always write out commands in full (`git command`) we should do it consistently in adjacent paragraphs. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2010, 04:51:50 UTC |
| 56a0572 | Markus Heidelberg | 13 May 2010, 12:47:53 UTC | Documentation: rebase -i ignores options passed to "git am" Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2010, 04:51:40 UTC |
| 08bda20 | Dmitry Potapov | 10 May 2010, 21:38:17 UTC | hash_object: correction for zero length file The check whether size is zero was done after if size <= SMALL_FILE_SIZE, as result, zero size case was never triggered. Instead zero length file was treated as any other small file. This did not caused any problem, but if we have a special case for size equal to zero, it is better to make it work and avoid redundant malloc(). Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 May 2010, 04:46:36 UTC |
| 3368edd | Tay Ray Chuan | 12 May 2010, 03:29:20 UTC | GIT-VERSION-GEN: restrict tags used Restrict the tags used to generate the version string to those that begin with "v", since git's tags for git-core (ie. excluding git-gui) are all of the form "vX.Y...". This is to avoid using private tags by the user in a clone of the git code repository, which may break certain machinery (eg. Makefile, gitk). Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 May 2010, 06:04:23 UTC |
| 87a074d | Jeff King | 10 May 2010, 09:42:06 UTC | handle "git --bare init <dir>" properly If we know we are creating a bare repository, we use setenv to set the GIT_DIR directory to the current directory (either where we already were, or one we created and chdir'd into with "git init --bare <dir>"). However, with "git --bare init <dir>" (note the --bare as a git wrapper option), the setup code actually sets GIT_DIR for us, but it uses the wrong, original cwd when a directory is given. Because our setenv does not use the overwrite flag, it is ignored. We need to set the overwrite flag, but only when we are given a directory on the command line. That still allows: GIT_DIR=foo.git git init --bare to work. The behavior is changed for: GIT_DIR=foo.git git init --bare bar.git which used to create the repository in foo.git, but now will use bar.git. This is more sane, as command line options should generally override the environment. Noticed by Oliver Hoffmann. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 May 2010, 18:25:37 UTC |
| 43acff3 | Jonathan Nieder | 08 May 2010, 23:17:29 UTC | cherry-pick: do not dump core when iconv fails When cherry-picking, usually the new and old commit encodings are both UTF-8. Most old iconv implementations do not support this trivial conversion, so on old platforms, out->message remains NULL, and later attempts to read it segfault. Fix this by noticing the input and output encodings match and skipping the iconv step, like the other reencode_string() call sites already do. Also stop segfaulting on other iconv failures: if iconv fails for some other reason, the best we can do is to pass the old message through. This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert: clarify label on conflict hunks, 2010-03-20). Reported-by: Andreas Krey <a.krey@gmx.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2010, 23:56:21 UTC |
| e5bd0a1 | Ramsay Jones | 08 May 2010, 17:36:15 UTC | Makefile: Fix 'clean' target to remove all gitweb build files In particular the gitweb/GITWEB-BUILD-OPTIONS file was not being removed by the main Makefile. However, the gitweb/Makefile has a 'clean' target that correctly removes all the build products. In order to fix the problem, rather than duplicate the clean-up instructions, we change the main Makefile so that it delegates the clean-up actions to the gitweb Makefile. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2010, 18:14:40 UTC |
| cfb88e9 | Leif Arne Storset | 05 May 2010, 14:16:25 UTC | Documentation/config.txt: GIT_NOTES_REWRITE_REF overrides notes.rewriteRef The documentation erroneously mentions the GIT_NOTES_REWRITE_REF override in the description of notes.rewrite.<command>. Move it under notes.rewriteRef where it belongs. Signed-off-by: Leif Arne Storset <lstorset@opera.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 May 2010, 04:38:50 UTC |
| b6b0afd | Jonathan Nieder | 06 May 2010, 08:41:10 UTC | test-lib: some shells do not let $? propagate into an eval In 3bf7886 (test-lib: Let tests specify commands to be run at end of test, 2010-05-02), the git test harness learned to run cleanup commands unconditionally at the end of a test. During each test, the intended cleanup actions are collected in the test_cleanup variable and evaluated. That variable looks something like this: eval_ret=$?; clean_something && (exit "$eval_ret") eval_ret=$?; clean_something_else && (exit "$eval_ret") eval_ret=$?; final_cleanup && (exit "$eval_ret") eval_ret=$? All cleanup actions are run unconditionally but if one of them fails it is properly reported through $eval_ret. On FreeBSD, unfortunately, $? is set at the beginning of an ‘eval’ to 0 instead of the exit status of the previous command. This results in tests using test_expect_code appearing to fail and all others appearing to pass, unless their cleanup fails. Avoid the problem by setting eval_ret before the ‘eval’ begins. Thanks to Jeff King for the explanation. Cc: Jeff King <peff@peff.net> Cc: Johannes Sixt <j6t@kdbg.org> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 May 2010, 20:16:14 UTC |
| 3bf7886 | Jonathan Nieder | 02 May 2010, 08:53:41 UTC | test-lib: Let tests specify commands to be run at end of test Certain actions can imply that if the test fails early, recovery from within other tests is too much to expect: - creating unwritable directories, like the EACCESS test in t0001-init - setting unusual configuration, like user.signingkey in t7004-tag - crashing and leaving the index lock held, like t3600-rm once did Some test scripts work around this by running cleanup actions outside the supervision of the test harness, with the unfortunate consequence that those commands are not appropriately echoed and their output not suppressed. Others explicitly save exit status, clean up, and then reset the exit status within the tests, which has excellent behavior but makes the tests hard to read. Still others ignore the problem. Allow tests a fourth option: by calling this function, tests can stack up commands they would like to be run to clean up. Commands passed to test_when_finished during a test are unconditionally run in the test environment immediately before the test is completed, in last-in-first-out order. If some cleanup command fails, then the other cleanup commands are still run before the failure is reported and the test script allowed to continue. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 22:27:52 UTC |
| 6b6f5d4 | Junio C Hamano | 04 May 2010, 22:20:47 UTC | Merge branch 'maint-1.7.0' into maint * maint-1.7.0: remove ecb parameter from xdi_diff_outf() | 04 May 2010, 22:20:47 UTC |
| dfea790 | René Scharfe | 04 May 2010, 20:41:34 UTC | remove ecb parameter from xdi_diff_outf() xdi_diff_outf() overrides the structure members of its last parameter, ignoring any value that callers pass in. It's no surprise then that all callers pass a pointer to an uninitialized structure. They also don't read it after the call, so the parameter is neither used for input nor for output. Turn it into a local variable of xdi_diff_outf(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 22:19:14 UTC |
| 2b873e0 | Ping Yin | 24 April 2010, 07:34:02 UTC | Documentation/git-send-email: Add "Use gmail as the smtp server" Signed-off-by: Ping Yin <pkufranky@gmail.com> Acked by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 17:12:26 UTC |
| 28ba96a | Junio C Hamano | 23 April 2010, 12:37:22 UTC | clone: quell the progress report from init and report on clone Currently, a local git clone reports only initializing an empty git dir, which is potentially confusing. Instead, report that cloning is in progress and when it is done (unless -q) is given, and suppress the init report. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 17:02:46 UTC |
| 64b9032 | Michal Sojka | 16 April 2010, 13:53:59 UTC | test-lib.sh: Add explicit license detail, with change from GPLv2 to GPLv2+. Dear Junio, this is a resend of relicensing patch for test suite library, which was initially sent by Carl Worth. Since the time you sent me acks for this patch collected by you, I collected 8 additional acks as is documented at https://git.wiki.kernel.org/index.php/Test-lib_reclicensing. There are still three contributors missing: Bert Wesarg, Stephan Beyer and Bryan Donlan. The contributions of first two are clearly not copyrightable. I'm not sure about the copyrightability of Bryan Donlan's contributions (git log -p --author='Bryan Donlan' t/test-lib.sh). Carl told me that in your ack collection process you missed only three acks. So I wonder whether you already did some analysis of which contributions are copyrightable. If so, are the missing acks in the list bellow? Thanks Michal 8<--------8<--------8<-------- This file has had no explicit license information noted in it, but has clearly been created and modified according to the terms of GPLv2 as with the rest of the git code base. The purpose of relicensing is to allow other GPLv3+ projects (in particular, the notmuch project: http://notmuchmail.org) to use this same test-suite structure and to contribute changes back as well. Signed-off-by: Carl Worth <cworth@cworth.org> Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Acked-by: Alex Riesen <raa.lkml@gmail.com> Acked-by: Brandon Casey <drafnel@gmail.com> Acked-by: Clemens Buchacher <drizzd@aon.at> Acked-by: David Reiss <dreiss@facebook.com> Acked-by: Emil Sit <sit@emilsit.net> Acked-by: Eric Wong <normalperson@yhbt.net> Acked-by: Fredrik Kuivinen <frekui@gmail.com> Acked-by: Gerrit Pape <pape@smarden.org> Acked-by: Christian Couder <chriscool@tuxfamily.org> Acked-by: Jakub Narebski <jnareb@gmail.com> Acked-by: Jeff King <peff@peff.net> Acked-by: Johan Herland <johan@herland.net> Acked-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Acked-by: Johannes Sixt <j6t@kdbg.org> Acked-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Josh Triplett <josh@joshtriplett.org> Acked-by: Junio C Hamano <gitster@pobox.com> Acked-by: Lea Wiemann <lewiemann@gmail.com> Acked-by: Markus Heidelberg <markus.heidelberg@web.de> Acked-by: Martin Waitz <tali@admingilde.org> Acked-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Acked-by: Matthias Lederhofer <matled@gmx.net> Acked-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Michele Ballabio <barra_cuda@katamail.com> Acked-by: Miklos Vajna <vmiklos@frugalware.org> Acked-by: Nicolas Pitre <nico@fluxnic.net> Acked-by: Pavel Roskin <proski@gnu.org> Acked-by: Petr Baudis <pasky@ucw.cz> Acked-by: Pierre Habouzit <madcoder@debian.org> Acked-by: Robin Rosenberg <robin.rosenberg@dewire.com> Acked-by: Shawn O. Pearce <spearce@spearce.org> Acked-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 May 2010, 17:01:49 UTC |
| 493429b | Sverre Rabbelier | 25 April 2010, 20:17:05 UTC | Gitweb: ignore built file Signed-off-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 May 2010, 15:27:58 UTC |
| ddb27a5 | Junio C Hamano | 02 May 2010, 03:23:10 UTC | Merge branch 'maint' * maint: index-pack: fix trivial typo in usage string git-submodule.sh: properly initialize shell variables | 02 May 2010, 03:23:10 UTC |
| ed215b1 | Michael J Gruber | 29 April 2010, 15:42:47 UTC | index-pack: fix trivial typo in usage string Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2010, 18:58:37 UTC |
| 48bb303 | Gerrit Pape | 26 April 2010, 09:50:39 UTC | git-submodule.sh: properly initialize shell variables git-submodule inherits variables from the environment it is started in, expects the internal variables init= and recursive= to have an empty value, but doesn't initialize them appropriately. Thanks to the selftests, this can be reproduced through init=1 make test recursive=1 make test With this commit the variables are initialized, and the selftests succeed even if these variables have some values in the environment. The bug was discovered through the Debian autobuilders http://bugs.debian.org/569594 Signed-off-by: Gerrit Pape <pape@smarden.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2010, 18:11:52 UTC |
| c8c073c | Alexey Mahotkin | 28 April 2010, 11:29:06 UTC | xdiff/xmerge.c: use memset() instead of explicit for-loop memset() is heavily optimized, and resulting assembler code is about 150 lines less for that file. Signed-off-by: Alexey Mahotkin <squadette@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 May 2010, 18:11:11 UTC |
| d599e04 | Junio C Hamano | 24 April 2010, 01:27:17 UTC | Git 1.7.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 April 2010, 01:27:17 UTC |
| 34c071a | Junio C Hamano | 24 April 2010, 01:24:32 UTC | Merge branch 'maint' * maint: Documentation improvements for the description of short format. | 24 April 2010, 01:24:32 UTC |
| e92e9cd | Eric Raymond | 23 April 2010, 17:40:15 UTC | Documentation improvements for the description of short format. Incorporates the detailed explanation from Jeff King in <20100410040959.GA11977@coredump.intra.peff.net> and fixes the bug noted by Junio C Hamano in <7vmxxc1i8g.fsf@alter.siamese.dyndns.org>. Signed-off-by: Eric S. Raymond <esr@thyrsus.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 19:33:41 UTC |
| 08641d0 | Junio C Hamano | 23 April 2010, 06:05:49 UTC | Sync with 1.7.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 06:05:49 UTC |
| 66cfd10 | Junio C Hamano | 23 April 2010, 05:46:24 UTC | Git 1.7.0.6 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 April 2010, 06:04:21 UTC |
| 5deb15e | Junio C Hamano | 23 April 2010, 05:39:26 UTC | Merge branch 'mg/use-default-abbrev-length-in-rev-list' into maint * mg/use-default-abbrev-length-in-rev-list: rev-list: use default abbrev length when abbrev-commit is in effect | 23 April 2010, 05:39:26 UTC |
| 0737975 | Junio C Hamano | 23 April 2010, 05:29:50 UTC | Merge branch 'wp/doc-filter-direction' into maint * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf | 23 April 2010, 05:29:50 UTC |
| 4fd8145 | Junio C Hamano | 23 April 2010, 05:29:13 UTC | Merge branch 'jk/maint-diffstat-overflow' into maint * jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations | 23 April 2010, 05:29:13 UTC |
| dd0c513 | Junio C Hamano | 23 April 2010, 05:29:07 UTC | Merge branch 'da/maint-python-startup' into maint * da/maint-python-startup: Makefile: Remove usage of deprecated Python "has_key" method | 23 April 2010, 05:29:07 UTC |
| 3e7f1e6 | Junio C Hamano | 22 April 2010, 06:54:04 UTC | Merge branch 'maint' * maint: Documentation/Makefile: fix interrupted builds of user-manual.xml | 22 April 2010, 06:54:04 UTC |
| f9dae0d | Jonathan Nieder | 22 April 2010, 01:18:21 UTC | Documentation/Makefile: fix interrupted builds of user-manual.xml Unlike gcc, asciidoc does not atomically write its output file or delete it when interrupted. If it is interrupted in the middle of writing an XML file, the result will be truncated input for xsltproc. XSLTPROC user-manual.html user-manual.xml:998: parser error : Premature end of data in t Take care of this case by writing to a temporary and renaming it when finished. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 April 2010, 06:46:51 UTC |
| ddd02b7 | Junio C Hamano | 20 April 2010, 05:41:30 UTC | Merge branch 'maint' * maint: t7012: Mark missing tests as TODO reflog: remove 'show' from 'expire's usage string MSVC: Fix build by adding missing termios.h dummy | 20 April 2010, 05:41:30 UTC |
| 3d81676 | Michael J Gruber | 19 April 2010, 08:14:32 UTC | t7012: Mark missing tests as TODO Currently, there are 6 tests which are not even written but are 'test_expect_failure message false'. Do not abuse test_expect_failure as a to do marker, but mark them as '#TODO' instead. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Acked-by: Nguyen Thai Ngoc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2010, 01:05:00 UTC |
| 580b7d3 | SZEDER Gábor | 19 April 2010, 09:52:30 UTC | reflog: remove 'show' from 'expire's usage string Most of 'expire's options are not recognized by the 'show' subcommand, hence it errors out. Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 April 2010, 00:52:14 UTC |
| 8165952 | Junio C Hamano | 19 April 2010, 08:28:27 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: MSVC: Fix build by adding missing termios.h dummy | 19 April 2010, 08:28:27 UTC |
| b756864 | Johannes Sixt | 19 April 2010, 07:37:20 UTC | MSVC: Fix build by adding missing termios.h dummy A use of this header file was introduced in eb80042 (Add missing #include to support TIOCGWINSZ on Solaris, 2010-01-11). Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2010, 08:28:21 UTC |
| 5469e2d | Junio C Hamano | 19 April 2010, 05:19:04 UTC | Git 1.7.1-rc2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 April 2010, 05:19:04 UTC |
| 407a963 | Junio C Hamano | 19 April 2010, 04:32:25 UTC | Merge branch 'rr/remote-helper-doc' * rr/remote-helper-doc: Documentation/remote-helpers: Fix typos and improve language Fixup: Second argument may be any arbitrary string Documentation/remote-helpers: Add invocation section Documentation/urls: Rewrite to accomodate <transport>::<address> Documentation/remote-helpers: Rewrite description | 19 April 2010, 04:32:25 UTC |
| c4df50c | Junio C Hamano | 19 April 2010, 04:32:21 UTC | Merge branch 'wp/doc-filter-direction' * wp/doc-filter-direction: documentation: clarify direction of core.autocrlf | 19 April 2010, 04:32:21 UTC |
| bc32d34 | Junio C Hamano | 19 April 2010, 04:31:50 UTC | Merge branch 'jk/maint-diffstat-overflow' * jk/maint-diffstat-overflow: diff: use large integers for diffstat calculations | 19 April 2010, 04:31:50 UTC |
| 779f946 | Junio C Hamano | 19 April 2010, 04:31:29 UTC | Merge branch 'jg/auto-initialize-notes-with-percent-n-in-format' * jg/auto-initialize-notes-with-percent-n-in-format: t3301: add tests to use --format="%N" pretty: Initialize notes if %N is used | 19 April 2010, 04:31:29 UTC |
| fab4502 | Junio C Hamano | 19 April 2010, 04:31:20 UTC | Merge branch 'maint' * maint: Documentation: Describe other situations where -z affects git diff | 19 April 2010, 04:31:20 UTC |
| e8a1228 | Junio C Hamano | 19 April 2010, 01:36:41 UTC | Merge git://git.kernel.org/pub/scm/gitk/gitk * git://git.kernel.org/pub/scm/gitk/gitk: gitk: Display dirty submodules correctly gitk: Fix display of copyright symbol gitk: Add emacs editor variable block gitk: Avoid calling tk_setPalette on Windows gitk: Don't clobber "Remember this view" setting gitk: Add comments to explain encode_view_opts and decode_view_opts gitk: Use consistent font for all text input fields gitk: Set the font for all listbox widgets gitk: Set the font for all spinbox widgets gitk: Remove forced use of sans-serif font gitk: Add Ctrl-W shortcut for closing the active window | 19 April 2010, 01:36:41 UTC |
| d43427d | Ramkumar Ramachandra | 18 April 2010, 00:57:37 UTC | Documentation/remote-helpers: Fix typos and improve language Fix some typos and errors in grammar and tense. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:29 UTC |
| 272a36b | Ramkumar Ramachandra | 18 April 2010, 00:56:37 UTC | Fixup: Second argument may be any arbitrary string This is intended to be a fixup for commit ad466d1 in pu. As Jonathan Neider pointed out, the second argument may be any arbitrary string, and need not conform to any URL-like shape. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:24 UTC |
| b6c8d2d | Ramkumar Ramachandra | 07 April 2010, 05:44:41 UTC | Documentation/remote-helpers: Add invocation section Add an 'Invocation' section to specify what the command line arguments mean. Also include a link to git-remote in the 'See Also' section. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:17 UTC |
| 5ce4f4e | Ramkumar Ramachandra | 06 April 2010, 08:38:19 UTC | Documentation/urls: Rewrite to accomodate <transport>::<address> Rewrite the first part of the document to explicitly show differences between the URLs that can be used with different transport protocols. Mention <transport>::<address> format to explicitly invoke a remote helper. Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:56:05 UTC |
| 00b84e9 | Ramkumar Ramachandra | 28 March 2010, 18:03:50 UTC | Documentation/remote-helpers: Rewrite description Rewrite the description section to describe what exactly remote helpers are and the need for them. Also mention the curl family of remote helpers as an example. [jc: with readability fixes from Jonathan squashed in] Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Reviewed-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Sverre Rabbelier <srabbelier@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:55:41 UTC |
| 03aa87e | Charles Bailey | 18 April 2010, 18:28:17 UTC | Documentation: Describe other situations where -z affects git diff -z also alters the behaviour of --name-only and --name-status. Signed-off-by: Charles Bailey <charles@hashpling.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 20:43:53 UTC |
| 77bc694 | Jeff King | 18 April 2010, 12:01:45 UTC | rebase-interactive: silence warning when no commits rewritten If you do a "rebase -i" and don't change any commits, nothing is rewritten, and we have no REWRITTEN_LIST. The shell prints out an ugly message: $ GIT_EDITOR=true git rebase -i HEAD^ /path/to/git-rebase--interactive: 1: cannot open /path/to/repo/.git/rebase-merge/rewritten-list: No such file Successfully rebased and updated refs/heads/master. We can fix it by not running "notes copy" at all if nothing was rewritten. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 18:41:53 UTC |
| 636db2c | Junio C Hamano | 18 April 2010, 18:19:39 UTC | t3301: add tests to use --format="%N" Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 April 2010, 18:19:39 UTC |
| f3bd6ab | Junio C Hamano | 17 April 2010, 19:40:45 UTC | Merge branch 'maint' * maint: t1010-mktree: Adjust expected result to code and documentation combined diff: correctly handle truncated file Document new "already-merged" rule for branch -d | 17 April 2010, 19:40:45 UTC |
| f02dd06 | Matthew Ogilvie | 17 April 2010, 02:29:18 UTC | t6006: do not write to /tmp Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:20 UTC |
| 3940730 | Chris Webb | 15 April 2010, 13:29:45 UTC | git-instaweb: pass through invoking user's path to gitweb CGI scripts When used with lighttpd or mongoose, git-instaweb previously passed a hard-coded, default value of PATH to the gitweb CGI script. Use the invoking user's value for PATH for this instead. (This is already implicitly the behaviour for other web servers supported by git-instaweb.) Signed-off-by: Chris Webb <chris@arachsys.com> Acked-by: Eric Wong <normalperson@yhbt.net> | 17 April 2010, 19:40:20 UTC |
| 8de096b | Junio C Hamano | 15 April 2010, 12:57:18 UTC | gitweb: simplify gitweb.min.* generation and clean-up rules GITWEB_CSS and GITWEB_JS are meant to be "what URI should the installed cgi script use to refer to the stylesheet and JavaScript", never "this is the name of the file we are building". Don't use them to decide what file to build minified versions in. While we are at it, lose FILES that is used only for "clean" target in a misguided way. "make clean" should try to remove all the potential build artifacts regardless of a minor configuration change. Instead of trying to remove only the build product "make clean" would have created if it were run without "clean", explicitly list the three potential build products for removal. Tested-by: Mark Rada <marada@uwaterloo.co> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:19 UTC |
| a6ccbbd | Jonathan Nieder | 15 April 2010, 09:36:25 UTC | tag -v: use RUN_GIT_CMD to run verify-tag This is the preferred way to run a git command. The only obvious observable effects I can think of are that the exec is properly reported in GIT_TRACE output and that verifying signed tags will still work if the git-verify-tag hard link in gitexecdir goes missing. Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 19:40:19 UTC |
| c308b9c | Will Palmer | 17 April 2010, 16:55:26 UTC | documentation: clarify direction of core.autocrlf The description for core.autocrlf refers to reads from / writes to "the filesystem", the only use of this rather ambiguous term, which technically could be referring to the git object database. (All other mentions are part of phrases such as "..filesystems (like NFS).."). Other sections, including the section on core.safecrlf, use the term "work tree" for the same purpose as the term "the filesystem" is used in the core.autocrlf section, so that seems like a good alternative, which makes it clearer what direction the addition/removal of CR characters occurs in. Signed-off-by: Will Palmer <wmpalmer@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 18:50:32 UTC |
| 0974c11 | Jeff King | 17 April 2010, 17:41:08 UTC | diff: use large integers for diffstat calculations The diffstat "added" and "changed" fields generally store line counts; however, for binary files, they store file sizes. Since we store and print these values as ints, a diffstat on a file larger than 2G can show a negative size. Instead, let's use uintmax_t, which should be at least 64 bits on modern platforms. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 18:30:21 UTC |
| 53b3c47 | Michael J Gruber | 15 April 2010, 09:34:07 UTC | t1010-mktree: Adjust expected result to code and documentation The last two tests here were always supposed to fail in the sense that, according to code and documentation, mktree should read non-recursive ls-tree output, but not recursive one, and therefore explicitely refuses to deal with slashes. Adjust the test (must_fail) so that it succeeds when mktree dies on slashes. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 17:30:00 UTC |
| 2179870 | Thomas Rast | 15 April 2010, 12:59:37 UTC | combined diff: correctly handle truncated file Consider an evil merge of two commits A and B, both of which have a file 'foo', but the merge result does not have that file. The combined-diff code learned in 4462731 (combine-diff: do not punt on removed or added files., 2006-02-06) to concisely show only the removal, since that is the evil part and the previous contents are presumably uninteresting. However, to diagnose an empty merge result, it overloaded the variable that holds the file's length. This means that the check also triggers for truncated files. Consequently, such files were not shown in the diff at all despite the merge being clearly evil. Fix this by adding a new variable that distinguishes whether the file was deleted (which is the case 4462731 handled) or truncated. In the truncated case, we show the full combined diff again, which is rather spammy but at least does not hide the evilness. Reported-by: David Martínez Martí <desarrollo@gestiweb.com> Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 April 2010, 17:23:59 UTC |
| a1d383c | Jens Lehmann | 09 April 2010, 20:16:42 UTC | gitk: Display dirty submodules correctly Since recently "git diff --submodule" prints out extra lines when the submodule contains untracked or modified files. Show all those lines of one submodule under the same header. Also for newly added or removed submodules the submodule name contained trailing garbage because the extraction of the name was not done right. Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Paul Mackerras <paulus@samba.org> | 17 April 2010, 08:53:24 UTC |
| fff0d0a | Jonathan Nieder | 15 April 2010, 07:25:38 UTC | Document new "already-merged" rule for branch -d v1.7.0-rc0~18^2 (branch -d: base the "already-merged" safety on the branch it merges with, 2009-12-29) taught ‘git branch’ a new heuristic for when it is safe to delete a branch without forcing the issue. It is safe to delete a branch "topic" without second thought if: - the branch "topic" is set up to pull from a (remote-tracking, usually) branch and is fully merged in that "upstream" branch, or - there is no branch.topic.merge configuration and branch "topic" is fully merged in the current HEAD. Update the man page to acknowledge the new rules. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2010, 07:53:40 UTC |
| 3e8c0eb | Jonathan Nieder | 15 April 2010, 07:35:20 UTC | Add .depend directories to .gitignore The makefile snippets that would land in these directories are already being ignored. Ignore the directories instead so they don’t show up in ‘git clean -n’ output. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 April 2010, 07:53:08 UTC |
| a6018bb | Junio C Hamano | 14 April 2010, 01:21:29 UTC | Merge branch 'maint' * maint: Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 Docs: Add -X option to git-merge's synopsis. Conflicts: Documentation/merge-options.txt | 14 April 2010, 01:21:29 UTC |
| 5b16360 | Johannes Gilger | 13 April 2010, 20:31:12 UTC | pretty: Initialize notes if %N is used When using git log --pretty='%N' without an explicit --show-notes, git would segfault. This patches fixes this behaviour by loading the needed notes datastructures if --pretty is used and the format contains %N. When --pretty='%N' is used together with --no-notes, %N won't be expanded. This is an extension to a proposed patch by Jeff King. Signed-off-by: Johannes Gilger <heipei@hackvalue.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 April 2010, 01:15:08 UTC |
| f78683f | Jay Soffian | 13 April 2010, 16:52:55 UTC | Documentation/config.txt: default gc.aggressiveWindow is 250, not 10 The default for gc.aggressiveWindow has been 250 since 1c192f3 (gc --aggressive: make it really aggressive, 2007-12-06). Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 April 2010, 19:27:19 UTC |
| adda3c3 | Marc Branchaud | 12 April 2010, 16:28:13 UTC | Docs: Add -X option to git-merge's synopsis. Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 April 2010, 16:50:09 UTC |
| 4553d58 | Junio C Hamano | 11 April 2010, 20:54:28 UTC | Merge branch 'jl/maint-submodule-gitfile-awareness' * jl/maint-submodule-gitfile-awareness: Windows: start_command: Support non-NULL dir in struct child_process | 11 April 2010, 20:54:28 UTC |
| f9a2743 | Johannes Sixt | 11 April 2010, 20:40:12 UTC | Windows: start_command: Support non-NULL dir in struct child_process A caller of start_command can set the member 'dir' to a directory to request that the child process starts with that directory as CWD. The first user of this feature was added recently in eee49b6 (Teach diff --submodule and status to handle .git files in submodules). On Windows, we have been lazy and had not implemented support for this feature, yet. This fixes the shortcoming. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 20:48:46 UTC |
| 7b575f3 | Junio C Hamano | 11 April 2010, 20:44:17 UTC | Sync with 1.7.0.5 | 11 April 2010, 20:46:08 UTC |
| fb10369 | Junio C Hamano | 11 April 2010, 20:44:05 UTC | Merge branch 'jc/doc-submit-gmail' * jc/doc-submit-gmail: SubmittingPatches: update GMail section | 11 April 2010, 20:44:05 UTC |
| fcd4240 | Junio C Hamano | 11 April 2010, 20:41:43 UTC | Git 1.7.0.5 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 20:42:33 UTC |
| c512b03 | Junio C Hamano | 11 April 2010, 20:39:47 UTC | Merge branch 'rc/maint-reflog-msg-for-forced-branch' into maint * rc/maint-reflog-msg-for-forced-branch: branch: say "Reset to" in reflog entries for 'git branch -f' operations | 11 April 2010, 20:39:47 UTC |
| d8c416b | Junio C Hamano | 11 April 2010, 19:17:42 UTC | blame documentation: -M/-C notice copied lines as well as moved ones Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 19:17:42 UTC |
| fe90c93 | Stephen Boyd | 11 April 2010, 08:43:46 UTC | t3507: Make test executable Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 April 2010, 19:13:13 UTC |
| b9aa901 | Junio C Hamano | 10 April 2010, 20:05:16 UTC | Git 1.7.1-rc1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 10 April 2010, 20:05:16 UTC |
| b92cbb6 | Junio C Hamano | 10 April 2010, 20:02:22 UTC | Merge branch 'mr/gitweb-jsmin' * mr/gitweb-jsmin: gitweb: update INSTALL to use shorter make target gitweb: add documentation to INSTALL regarding gitweb.js instaweb: add minification awareness Gitweb: add autoconfigure support for minifiers Gitweb: add support for minifying gitweb.css Gitweb: add ignore and clean rules for minified files | 10 April 2010, 20:02:22 UTC |
