| 97222d9 | Junio C Hamano | 07 March 2010, 19:07:51 UTC | Git 1.7.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 19:07:51 UTC |
| 5565f47 | Bert Wesarg | 18 November 2009, 16:15:19 UTC | unset GREP_OPTIONS in test-lib.sh I used to set GREP_OPTIONS to exclude *.orig and *.rej files. But with this the test t4252-am-options.sh fails because it calls grep with a .rej file: grep "@@ -1,3 +1,3 @@" file-2.rej Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 19:05:18 UTC |
| 5d00592 | Matthieu Moy | 05 March 2010, 18:43:23 UTC | stash: suggest the correct command line for unknown options. Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 04:00:42 UTC |
| c9c8c56 | Stephen Boyd | 05 March 2010, 08:20:38 UTC | t7406: Fix submodule init config tests These tests have been broken since they were introduced in commits ca2cedb (git-submodule: add support for --rebase., 2009-04-24) and 42b4917 (git-submodule: add support for --merge., 2009-06-03). 'git submodule init' expects the submodules to exist in the index. In this case, the submodules don't exist and therefore looking for the submodules will always fail. To make matters worse, git submodule fails visibly to the user by saying: error: pathspec 'rebasing' did not match any file(s) known to git. Did you forget to 'git add'? but doesn't return an error code. This allows the test to fail silently. Fix it by adding the submodules first. Cc: Johan Herland <johan@herland.net> Cc: Peter Hutterer <peter.hutterer@who-t.net> Cc: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 07 March 2010, 04:00:02 UTC |
| 3609ad8 | Junio C Hamano | 05 March 2010, 06:39:38 UTC | Update draft release notes to 1.7.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2010, 06:39:38 UTC |
| 7d18122 | Junio C Hamano | 05 March 2010, 06:27:12 UTC | Merge branch 'jn/gitweb-config-error-die' into maint * jn/gitweb-config-error-die: gitweb: Die if there are parsing errors in config file | 05 March 2010, 06:27:12 UTC |
| 6914c66 | Junio C Hamano | 05 March 2010, 06:27:04 UTC | Merge branch 'jn/maint-fix-pager' into maint * jn/maint-fix-pager: tests: Fix race condition in t7006-pager t7006-pager: if stdout is not a terminal, make a new one tests: Add tests for automatic use of pager am: Fix launching of pager git svn: Fix launching of pager git.1: Clarify the behavior of the --paginate option Make 'git var GIT_PAGER' always print the configured pager Fix 'git var' usage synopsis | 05 March 2010, 06:27:04 UTC |
| 712d352 | Junio C Hamano | 05 March 2010, 06:26:44 UTC | Merge branch 'tr/maint-cherry-pick-list' into maint * tr/maint-cherry-pick-list: cherry_pick_list: quit early if one side is empty | 05 March 2010, 06:26:44 UTC |
| 8cc3709 | Junio C Hamano | 05 March 2010, 06:26:39 UTC | Merge branch 'ld/maint-diff-quiet-w' into maint * ld/maint-diff-quiet-w: git-diff: add a test for git diff --quiet -w git diff --quiet -w: check and report the status | 05 March 2010, 06:26:39 UTC |
| 868cfe0 | Junio C Hamano | 05 March 2010, 06:26:33 UTC | Merge branch 'rs/optim-text-wrap' into maint * rs/optim-text-wrap: utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() utf8.c: remove strbuf_write() utf8.c: remove print_spaces() utf8.c: remove print_wrapped_text() | 05 March 2010, 06:26:33 UTC |
| 780fc9a | Junio C Hamano | 05 March 2010, 06:26:17 UTC | Merge branch 'dp/read-not-mmap-small-loose-object' into maint * dp/read-not-mmap-small-loose-object: hash-object: don't use mmap() for small files | 05 March 2010, 06:26:17 UTC |
| 035aa76 | Junio C Hamano | 05 March 2010, 06:26:05 UTC | Merge branch 'np/compress-loose-object-memsave' into maint * np/compress-loose-object-memsave: sha1_file: be paranoid when creating loose objects sha1_file: don't malloc the whole compressed result when writing out objects | 05 March 2010, 06:26:05 UTC |
| 6c4ee22 | Junio C Hamano | 05 March 2010, 06:25:45 UTC | Merge branch 'jc/maint-status-preload' into maint * jc/maint-status-preload: status: preload index to optimize lstat(2) calls | 05 March 2010, 06:25:45 UTC |
| 801bad3 | Junio C Hamano | 05 March 2010, 06:25:37 UTC | Merge branch 'gf/maint-sh-setup-nongit-ok' into maint * gf/maint-sh-setup-nongit-ok: require_work_tree broken with NONGIT_OK | 05 March 2010, 06:25:37 UTC |
| ce5044d | Junio C Hamano | 05 March 2010, 06:25:23 UTC | Merge branch 'cc/maint-bisect-paths' into maint * cc/maint-bisect-paths: bisect: error out when passing bad path parameters | 05 March 2010, 06:25:23 UTC |
| 507665e | Junio C Hamano | 05 March 2010, 06:24:25 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: Remove extra '-' from git-am(1) | 05 March 2010, 06:24:25 UTC |
| e8a285e | Junio C Hamano | 05 March 2010, 06:24:19 UTC | Merge branch 'maint-1.6.5' into maint-1.6.6 * maint-1.6.5: Remove extra '-' from git-am(1) | 05 March 2010, 06:24:19 UTC |
| 8024d59 | Michal Sojka | 04 March 2010, 12:08:28 UTC | Remove extra '-' from git-am(1) Signed-off-by: Michal Sojka <sojkam1@fel.cvut.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 05 March 2010, 06:02:44 UTC |
| 511da22 | Junio C Hamano | 03 March 2010, 07:11:36 UTC | Start preparing for 1.7.0.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2010, 07:11:36 UTC |
| b46946a | Junio C Hamano | 03 March 2010, 06:55:22 UTC | Merge branch 'tc/maint-transport-ls-remote-with-void' into maint * tc/maint-transport-ls-remote-with-void: transport: add got_remote_refs flag | 03 March 2010, 06:55:22 UTC |
| be8198b | Junio C Hamano | 03 March 2010, 06:55:03 UTC | Merge branch 'hm/maint-imap-send-crlf' into maint * hm/maint-imap-send-crlf: git-imap-send: Convert LF to CRLF before storing patch to draft box | 03 March 2010, 06:55:03 UTC |
| a886ba2 | Junio C Hamano | 03 March 2010, 06:54:50 UTC | Merge branch 'sp/maint-push-sideband' into maint * sp/maint-push-sideband: receive-pack: Send internal errors over side-band #2 t5401: Use a bare repository for the remote peer receive-pack: Send hook output over side band #2 receive-pack: Wrap status reports inside side-band-64k receive-pack: Refactor how capabilities are shown to the client send-pack: demultiplex a sideband stream with status data run-command: support custom fd-set in async run-command: Allow stderr to be a caller supplied pipe Conflicts: builtin-receive-pack.c run-command.c t/t5401-update-hooks.sh | 03 March 2010, 06:54:50 UTC |
| a625740 | Junio C Hamano | 03 March 2010, 06:38:02 UTC | Merge branch 'jc/maint-fix-test-perm' into maint * jc/maint-fix-test-perm: lib-patch-mode.sh: Fix permission t6000lib: Fix permission | 03 March 2010, 06:38:02 UTC |
| f54555c | Junio C Hamano | 03 March 2010, 06:28:49 UTC | Merge branch 'np/fast-import-idx-v2' into maint * np/fast-import-idx-v2: fast-import: use the diff_delta() max_delta_size argument fast-import: honor pack.indexversion and pack.packsizelimit config vars fast-import: make default pack size unlimited fast-import: use write_idx_file() instead of custom code fast-import: use sha1write() for pack data fast-import: start using struct pack_idx_entry | 03 March 2010, 06:28:49 UTC |
| 9be3614 | Jakub Narebski | 01 March 2010, 21:51:34 UTC | gitweb: Fix project-specific feature override behavior This commit fixes a bug in processing project-specific override in a situation when there is no project, e.g. for the projects list page. When 'snapshot' feature had project specific config override enabled by putting $feature{'snapshot'}{'override'} = 1; (or equivalent) in $GITWEB_CONFIG, and when viewing toplevel gitweb page, which means the projects list page (to be more exact this happens for any project-less action), gitweb would put the following Perl warnings in error log: gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2065. fatal: error processing config file(s) gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2221. gitweb.cgi: Use of uninitialized value $git_dir in concatenation (.) or string at gitweb.cgi line 2218. The problem is in the following fragment of code: # path to the current git repository our $git_dir; $git_dir = "$projectroot/$project" if $project; # list of supported snapshot formats our @snapshot_fmts = gitweb_get_feature('snapshot'); @snapshot_fmts = filter_snapshot_fmts(@snapshot_fmts); For the toplevel gitweb page, which is the list of projects, $project is not defined, therefore neither is $git_dir. gitweb_get_feature() subroutine calls git_get_project_config() if project specific override is turned on... but we don't have project here. Those errors mentioned above occur in the following fragment of code in git_get_project_config(): # get config if (!defined $config_file || $config_file ne "$git_dir/config") { %config = git_parse_project_config('gitweb'); $config_file = "$git_dir/config"; } git_parse_project_config() calls git_cmd() which has '--git-dir='.$git_dir There are (at least) three possible solutions: 1. Harden gitweb_get_feature() so that it doesn't call git_get_project_config() if $project (and therefore $git_dir) is not defined; there is no project for project specific config. 2. Harden git_get_project_config() like you did in your fix, returning early if $git_dir is not defined. 3. Harden git_cmd() so that it doesn't add "--git-dir=$git_dir" if $git_dir is not defined, and change git_get_project_config() so that it doesn't even try to access $git_dir if it is not defined. This commit implements both 1.) and 2.), i.e. gitweb_get_feature() doesn't call project-specific override if $git_dir is not defined (if there is no project), and git_get_project_config() returns early if $git_dir is not defined. Add a test for this bug to t/t9500-gitweb-standalone-no-errors.sh test. Reported-by: Eli Barzilay <eli@barzilay.org> Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2010, 20:14:44 UTC |
| 964ad92 | Sylvain Rabot | 02 March 2010, 00:04:57 UTC | gitweb multiple project roots documentation This commit adds in the gitweb/README file a description of how to use gitweb with several project roots using apache virtualhost rewrite rules. Signed-off-by: Sylvain Rabot <sylvain@abstraction.fr> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2010, 20:14:20 UTC |
| 8f69f72 | Christian Couder | 28 February 2010, 22:19:09 UTC | bisect: error out when passing bad path parameters As reported by Mark Lodato, "git bisect", when it was started with path parameters that match no commit was kind of working without taking account of path parameters and was reporting something like: Bisecting: -1 revisions left to test after this (roughly 0 steps) It is more correct and safer to just error out in this case, before displaying the revisions left, so this patch does just that. Note that this bug is very old, it exists at least since v1.5.5. And it is possible to detect that case earlier in the bisect algorithm, but it is not clear that it would be an improvement to error out earlier, on the contrary it may change the behavior of "git rev-list --bisect-all" for example, which is currently correct. Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2010, 09:04:35 UTC |
| c5e5f60 | Junio C Hamano | 28 February 2010, 19:41:24 UTC | Git 1.7.0.1 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2010, 19:41:24 UTC |
| c0d3a38 | Mark Lodato | 27 February 2010, 04:57:48 UTC | Remove reference to GREP_COLORS from documentation There is no longer support for external grep, as per bbc09c2 (grep: rip out support for external grep, 2010-01-12), so remove the reference to it from the documentation. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2010, 19:13:11 UTC |
| 77e8466 | Markus Heidelberg | 28 February 2010, 15:49:15 UTC | sha1_name: fix segfault caused by invalid index access The code to see if user input "git show :path" makes sense tried to access the index without properly checking the array bound. Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2010, 18:32:06 UTC |
| 64da6e2 | Junio C Hamano | 26 February 2010, 07:21:42 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: t3301-notes: insert a shbang line in ./fake_editor.sh | 26 February 2010, 07:21:42 UTC |
| 97a449e | Johannes Sixt | 25 February 2010, 10:39:50 UTC | t3301-notes: insert a shbang line in ./fake_editor.sh This is required on Windows because git-notes is now a built-in rather than a shell script. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2010, 20:20:16 UTC |
| 8bb45b2 | Matt Kraai | 24 February 2010, 14:18:25 UTC | commit: quote the user name in the example If the user runs git config --global user.name Your Name as suggested, user.name will be set to "Your". With this patch, the suggested command will be git config --global user.name "Your Name" which will set user.name to "Your Name" and hopefully help users avoid the former mistake. Signed-off-by: Matt Kraai <kraai@ftbfs.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 24 February 2010, 23:34:00 UTC |
| d951615 | Junio C Hamano | 24 February 2010, 23:33:23 UTC | Merge branch 'ml/maint-grep-doc' into maint * ml/maint-grep-doc: grep documentation: clarify what files match | 24 February 2010, 23:33:23 UTC |
| 29b6754 | Jonathan Nieder | 22 February 2010, 14:35:46 UTC | am: remove rebase-apply directory before gc When git am does an automatic gc it doesn't clean up the rebase-apply directory until after this has finished. This means that if the user aborts the gc then future am or rebase operations will report that an existing operation is in progress, which is undesirable and confusing. Reported by Mark Brown <broonie@debian.org> through http://bugs.debian.org/570966 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2010, 22:26:29 UTC |
| 689b8c2 | Bert Wesarg | 23 February 2010, 20:11:53 UTC | rerere: fix memory leak if rerere images can't be read Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2010, 22:24:43 UTC |
| 1675862 | Bert Wesarg | 23 February 2010, 20:11:12 UTC | Documentation: mention conflict marker size argument (%L) for merge driver 23a64c9e (conflict-marker-size: new attribute, 2010-01-16) introduced the new attribute and also pass the conflict marker size as %L to merge driver commands. This documents the substitution. Signed-off-by: Bert Wesarg <bert.wesarg@googlemail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 February 2010, 21:11:28 UTC |
| 8c33b4c | Jonathan Nieder | 22 February 2010, 08:46:33 UTC | tests: Fix race condition in t7006-pager Pagers that do not consume their input are dangerous: for example, $ GIT_PAGER=: git log $ echo $? 141 $ The only reason these tests were able to work before was that 'git log' would write to the pipe (and not fill it) before the pager had time to terminate and close the pipe. Fix it by using a program that consumes its input, namely wc (as suggested by Johannes). Reported-by: Johannes Sixt <j.sixt@viscovery.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2010, 22:19:28 UTC |
| 748af44 | Nicolas Pitre | 21 February 2010, 20:48:06 UTC | sha1_file: be paranoid when creating loose objects We don't want the data being deflated and stored into loose objects to be different from what we expect. While the deflated data is protected by a CRC which is good enough for safe data retrieval operations, we still want to be doubly sure that the source data used at object creation time is still what we expected once that data has been deflated and its CRC32 computed. The most plausible data corruption may occur if the source file is modified while Git is deflating and writing it out in a loose object. Or Git itself could have a bug causing memory corruption. Or even bad RAM could cause trouble. So it is best to make sure everything is coherent and checksum protected from beginning to end. To do so we compute the SHA1 of the data being deflated _after_ the deflate operation has consumed that data, and make sure it matches with the expected SHA1. This way we can rely on the CRC32 checked by the inflate operation to provide a good indication that the data is still coherent with its SHA1 hash. One pathological case we ignore is when the data is modified before (or during) deflate call, but changed back before it is hashed. There is some overhead of course. Using 'git add' on a set of large files: Before: real 0m25.210s user 0m23.783s sys 0m1.408s After: real 0m26.537s user 0m25.175s sys 0m1.358s The overhead is around 5% for full data coherency guarantee. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2010, 06:33:25 UTC |
| 1caaf22 | Larry D'Anna | 22 February 2010, 02:58:44 UTC | git-diff: add a test for git diff --quiet -w This patch adds two test cases for: 6977c25 git diff --quiet -w: check and report the status Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2010, 05:57:19 UTC |
| ea68b0c | Dmitry Potapov | 21 February 2010, 06:32:19 UTC | hash-object: don't use mmap() for small files Using read() instead of mmap() can be 39% speed up for 1Kb files and is 1% speed up 1Mb files. For larger files, it is better to use mmap(), because the difference between is not significant, and when there is not enough memory, mmap() performs much better, because it avoids swapping. Signed-off-by: Dmitry Potapov <dpotapov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2010, 19:39:10 UTC |
| 9892beb | Nicolas Pitre | 21 February 2010, 04:27:31 UTC | sha1_file: don't malloc the whole compressed result when writing out objects There is no real advantage to malloc the whole output buffer and deflate the data in a single pass when writing loose objects. That is like only 1% faster while using more memory, especially with large files where memory usage is far more. It is best to deflate and write the data out in small chunks reusing the same memory instead. For example, using 'git add' on a few large files averaging 40 MB ... Before: 21.45user 1.10system 0:22.57elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+828040outputs (0major+142640minor)pagefaults 0swaps After: 21.50user 1.25system 0:22.76elapsed 99%CPU (0avgtext+0avgdata 0maxresident)k 0inputs+828040outputs (0major+104408minor)pagefaults 0swaps While the runtime stayed relatively the same, the number of minor page faults went down significantly. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2010, 19:36:23 UTC |
| 2d3ca21 | Jonathan Nieder | 20 February 2010, 08:50:25 UTC | t7006-pager: if stdout is not a terminal, make a new one Testing pagination requires (fake or real) access to a terminal so we can see whether the pagination automatically kicks in, which makes it hard to get good coverage when running tests without --verbose. There are a number of ways to work around that: - Replace all isatty calls with calls to a custom xisatty wrapper that usually checks for a terminal but can be overridden for tests. This would be workable, but it would require implementing xisatty separately in three languages (C, shell, and perl) and making sure that any code that is to be tested always uses the wrapper. - Redirect stdout to /dev/tty. This would be problematic because there might be no terminal available, and even if a terminal is available, it might not be appropriate to spew output to it. - Create a new pseudo-terminal on the fly and capture its output. This patch implements the third approach. The new test-terminal.perl helper uses IO::Pty from Expect.pm to create a terminal and executes the program specified by its arguments with that terminal as stdout. If the IO::Pty module is missing or not working on a system, the test script will maintain its old behavior (skipping most of its tests unless GIT_TEST_OPTS includes --verbose). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2010, 19:08:17 UTC |
| 36c0797 | Thomas Rast | 20 February 2010, 11:42:04 UTC | cherry_pick_list: quit early if one side is empty The --cherry-pick logic starts by counting the commits on each side, so that it can filter away commits on the bigger one. However, so far it missed an opportunity for optimization: it doesn't need to do any work if either side is empty. This in particular helps the common use-case 'git rebase -i HEAD~$n': it internally uses --cherry-pick, but since HEAD~$n is a direct ancestor the left side is always empty. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 18:33:11 UTC |
| 60b6e22 | Jonathan Nieder | 19 February 2010, 07:18:58 UTC | tests: Add tests for automatic use of pager Git’s automatic pagination support has some subtleties. Add some tests to make sure we don’t break: - when git will use a pager by default; - the effect of the --paginate and --no-pager options; - the effect of pagination on use of color; - how the choice of pager is configured. This does not yet test: - use of pager by scripted commands (git svn and git am); - effect of the pager.* configuration variables; - setting of the LESS variable. Some features involve checking whether stdout is a terminal, so many of these tests are skipped unless output is passed through to the terminal (i.e., unless $GIT_TEST_OPTS includes --verbose). The immediate purpose for these tests was to avoid making things worse after the breakage from my jn/editor-pager series (see commit 376f39, 2009-11-20). Thanks to Sebastian Celis <sebastian@sebastiancelis.com> for the report. Helped-by: Jeff King <peff@peff.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 17:34:28 UTC |
| 462749b | René Scharfe | 19 February 2010, 22:20:44 UTC | utf8.c: speculatively assume utf-8 in strbuf_add_wrapped_text() is_utf8() works by calling utf8_width() for each character at the supplied location. In strbuf_add_wrapped_text(), we do that anyway while wrapping the lines. So instead of checking the encoding beforehand, optimistically assume that it's utf-8 and wrap along until an invalid character is hit, and when that happens start over. This pays off if the text consists only of valid utf-8 characters. The following command was run against the Linux kernel repo with git 1.7.0: $ time git log --format='%b' v2.6.32 >/dev/null real 0m2.679s user 0m2.580s sys 0m0.100s $ time git log --format='%w(60,4,8)%b' >/dev/null real 0m4.342s user 0m4.230s sys 0m0.110s And with this patch series: $ time git log --format='%w(60,4,8)%b' >/dev/null real 0m3.741s user 0m3.630s sys 0m0.110s So the cost of wrapping is reduced to 70% in this case. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 17:22:44 UTC |
| 68ad5e1 | René Scharfe | 19 February 2010, 22:16:45 UTC | utf8.c: remove strbuf_write() The patch before the previous one made sure that all callers of strbuf_add_wrapped_text() supply a strbuf. Replace all calls of strbuf_write() with regular strbuf functions and remove it. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 17:19:35 UTC |
| 3c0ff44 | René Scharfe | 19 February 2010, 22:15:55 UTC | utf8.c: remove print_spaces() The previous patch made sure that strbuf_add_wrapped_text() (and thus strbuf_add_indented_text(), too) always get a strbuf. Make use of this fact by adding strbuf_addchars(), a small helper that adds a char the specified number of times to a strbuf, and use it to replace print_spaces(). Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 17:19:06 UTC |
| bb96a2c | René Scharfe | 19 February 2010, 22:15:01 UTC | utf8.c: remove print_wrapped_text() strbuf_add_wrapped_text() is called only from print_wrapped_text() without a strbuf (in which case it writes its results to stdout). At its only callsite, supply a strbuf, call strbuf_add_wrapped_text() directly and remove the wrapper function. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 17:18:04 UTC |
| b39c361 | Evan Powers | 16 February 2010, 08:44:08 UTC | git-p4: fix bug in symlink handling Fix inadvertent breakage from b932705 (git-p4: stream from perforce to speed up clones, 2009-07-30) in the code that strips the trailing '\n' from p4 print on a symlink. (In practice, contents is of the form ['target\n', ''].) Signed-off-by: Evan Powers <evan.powers@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 16:38:21 UTC |
| 4551d03 | Thomas Rast | 20 February 2010, 00:18:44 UTC | t1450: fix testcases that were wrongly expecting failure Almost exactly a year ago in 02a6552 (Test fsck a bit harder), I introduced two testcases that were expecting failure. However, the only bug was that the testcases wrote *blobs* because I forgot to pass -t tag to hash-object. Fix this, and then adjust the rest of the test to properly check the result. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 05:56:19 UTC |
| e9e9219 | Jacob Helwig | 15 February 2010, 12:33:06 UTC | Documentation: Fix indentation problem in git-commit(1) Ever since the "See linkgit:git-config[1]..." paragraph was added to the description for --untracked-files (d6293d1), the paragraphs for the following options were indented at the same level as the "See linkgit:git-config[1]" paragraph. This problem showed up in the manpages, but not in the HTML documentation. While this does fix the alignment of the options following --untracked-files in the manpage, the "See linkgit..." portion of the description does not retain its previous indentation level in the manpages, or HTML documentation. Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Acked-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 February 2010, 03:03:24 UTC |
| 7c0be4d | Junio C Hamano | 19 February 2010, 09:31:37 UTC | Merge branch 'jk/maint-rmdir-fix' into maint * jk/maint-rmdir-fix: rm: fix bug in recursive subdirectory removal | 19 February 2010, 09:31:37 UTC |
| 3fc0d13 | Jeff King | 19 February 2010, 05:57:21 UTC | rm: fix bug in recursive subdirectory removal If we remove a path in a/deep/subdirectory, we should try to remove as many trailing components as possible (i.e., subdirectory, then deep, then a). However, the test for the return value of rmdir was reversed, so we only ever deleted at most one level. The fix is in remove_path, so "apply" and "merge-recursive" also are fixed. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2010, 06:22:22 UTC |
| 738820a | Stephen Boyd | 18 February 2010, 09:10:28 UTC | Documentation: describe --thin more accurately The description for --thin was misleading and downright wrong. Correct it with some inspiration from the description of index-pack's --fix-thin and some background information from Nicolas Pitre <nico@fluxnic.net>. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2010, 01:13:18 UTC |
| cc1b8d8 | Jeff King | 18 February 2010, 01:16:20 UTC | docs: don't talk about $GIT_DIR/refs/ everywhere It is misleading to say that we pull refs from $GIT_DIR/refs/*, because we may also consult the packed refs mechanism. These days we tend to treat the "refs hierarchy" as more of an abstract namespace that happens to be represented as $GIT_DIR/refs. At best, this is a minor inaccuracy, but at worst it can confuse users who then look in $GIT_DIR/refs and find that it is missing some of the refs they expected to see. This patch drops most uses of "$GIT_DIR/refs/*", changing them into just "refs/*", under the assumption that users can handle the concept of an abstract refs namespace. There are a few things to note: - most cases just dropped the $GIT_DIR/ portion. But for cases where that left _just_ the word "refs", I changed it to "refs/" to help indicate that it was a hierarchy. I didn't do the same for longer paths (e.g., "refs/heads" remained, instead of becoming "refs/heads/"). - in some cases, no change was made, as the text was explicitly about unpacked refs (e.g., the discussion in git-pack-refs). - In some cases it made sense instead to note the existence of packed refs (e.g., in check-ref-format and rev-parse). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 February 2010, 05:40:09 UTC |
| e3ff352 | Junio C Hamano | 17 February 2010, 23:00:00 UTC | Update 1.7.0.1 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 23:00:00 UTC |
| c69f921 | Junio C Hamano | 17 February 2010, 22:55:24 UTC | Merge branch 'jk/cherry-pick-reword' into maint * jk/cherry-pick-reword: cherry-pick: prettify the advice message cherry-pick: show commit name instead of sha1 cherry-pick: format help message as strbuf cherry-pick: refactor commit parsing code cherry-pick: rewrap advice message | 17 February 2010, 22:55:24 UTC |
| 031f82f | Junio C Hamano | 17 February 2010, 22:55:15 UTC | Merge branch 'jk/grep-double-dash' into maint * jk/grep-double-dash: accept "git grep -- pattern" | 17 February 2010, 22:55:15 UTC |
| 07cb9a3 | Junio C Hamano | 17 February 2010, 22:55:09 UTC | Merge branch 'jc/typo' into maint * jc/typo: Typofixes outside documentation area | 17 February 2010, 22:55:09 UTC |
| 149794d | Junio C Hamano | 17 February 2010, 20:30:41 UTC | status: preload index to optimize lstat(2) calls Noticed by James Pickens Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 20:30:41 UTC |
| b500d5e | Nicolas Pitre | 17 February 2010, 19:05:56 UTC | fast-import: use the diff_delta() max_delta_size argument This let diff_delta() abort early if it is going to bust the given size limit. Also, only objects larger than 20 bytes are considered as objects smaller than that are most certainly going to produce larger deltas than the original object due to the additional headers. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:44 UTC |
| 8c2ca8d | Nicolas Pitre | 17 February 2010, 19:05:55 UTC | fast-import: honor pack.indexversion and pack.packsizelimit config vars Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:44 UTC |
| 89e0a3a | Nicolas Pitre | 17 February 2010, 19:05:54 UTC | fast-import: make default pack size unlimited Now that fast-import is creating packs with index version 2, there is no point limiting the pack size by default. A pack split will still happen if off_t is not sufficiently large to hold large offsets. While updating the doc, let's remove the "packfiles fit on CDs" suggestion. Pack files created by fast-import are still suboptimal and a 'git repack -a -f -d' or even 'git gc --aggressive' would be a pretty good idea before considering storage on CDs. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:43 UTC |
| 427cb22 | Nicolas Pitre | 17 February 2010, 19:05:53 UTC | fast-import: use write_idx_file() instead of custom code This allows for the creation of pack index version 2 with its object CRC and the possibility for a pack to be larger than 4 GB. Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:43 UTC |
| 2128181 | Nicolas Pitre | 17 February 2010, 19:05:52 UTC | fast-import: use sha1write() for pack data This is in preparation for using write_idx_file(). Also, by using sha1write() we get some buffering to reduces the number of write syscalls, and the written data is SHA1 summed which allows for the extra data integrity validation check performed in fixup_pack_header_footer() (details on this in commit abeb40e5aa). Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:42 UTC |
| 3fc366b | Nicolas Pitre | 17 February 2010, 19:05:51 UTC | fast-import: start using struct pack_idx_entry This is in preparation for using write_idx_file(). Signed-off-by: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 19:08:42 UTC |
| ab62677 | Gabriel Filion | 17 February 2010, 04:18:50 UTC | require_work_tree broken with NONGIT_OK With NONGIT_OK set, require_work_tree function outside a git repository gives a syntax error. This is caused by an incorrect use of "test" that didn't anticipate $(git rev-parse --is-inside-work-tree) may return an empty string. Properly quote the argument to "test", and send the standard error stream to /dev/null to avoid giving duplicate error messages. Signed-off-by: Gabriel Filion <lelutin@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 18:55:12 UTC |
| 3ac4440 | Mark Lodato | 16 February 2010, 00:25:40 UTC | grep documentation: clarify what files match Clarify that git-grep(1) searches only tracked files, and that each <pathspec> is a pathspec, as in any other ordinary git commands. Add an example to show a simple use case for searching all .c and .h files in the current directory and below. Signed-off-by: Mark Lodato <lodatom@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 07:00:35 UTC |
| d3f6976 | Junio C Hamano | 17 February 2010, 06:25:03 UTC | Prepare 1.7.0.1 release notes Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 February 2010, 06:25:03 UTC |
| 354d9f8 | Junio C Hamano | 17 February 2010, 06:23:25 UTC | Merge branch 'jc/maint-grep-one-thread-mutex-fix' into maint * jc/maint-grep-one-thread-mutex-fix: Fix use of mutex in threaded grep | 17 February 2010, 06:23:25 UTC |
| 5f02d31 | Junio C Hamano | 16 February 2010, 02:34:28 UTC | Fix use of mutex in threaded grep The program can decide at runtime not to use threading even if the support is compiled in. In such a case, mutexes are not necessary and left uninitialized. But the code incorrectly tried to take and release the read_sha1_mutex unconditionally. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Fredrik Kuivinen <frekui@gmail.com> | 17 February 2010, 03:19:05 UTC |
| e7b3cea | Junio C Hamano | 16 February 2010, 23:05:02 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught Remove hyphen from "git-command" in two error messages | 16 February 2010, 23:05:02 UTC |
| eb0bcd0 | Junio C Hamano | 16 February 2010, 23:04:55 UTC | Merge branch 'maint-1.6.5' into maint-1.6.6 * maint-1.6.5: dwim_ref: fix dangling symref warning stash pop: remove 'apply' options during 'drop' invocation diff: make sure --output=/bad/path is caught | 16 February 2010, 23:04:55 UTC |
| b0d66e1 | Tay Ray Chuan | 16 February 2010, 07:18:21 UTC | transport: add got_remote_refs flag transport_get_remote_refs() in tranport.c checks transport->remote_refs to determine whether transport->get_refs_list() should be invoked. The logic is "if it is NULL, we haven't run ls-remote to find out yet". However, transport->remote_refs could still be NULL while cloning from an empty repository. This causes get_refs_list() to be run unnecessarily. Introduce a flag, transport->got_remote_refs, to more explicitly record if we have run transport->get_refs_list() already. Signed-off-by: Tay Ray Chuan <rctay89@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 17:11:22 UTC |
| 003c6ab | Jeff King | 16 February 2010, 07:03:16 UTC | dwim_ref: fix dangling symref warning If we encounter a symref that is dangling, in most cases we will warn about it. The one exception is a dangling HEAD, as that indicates a branch yet to be born. However, the check in dwim_ref was not quite right. If we were fed something like "HEAD^0" we would try to resolve "HEAD", see that it is dangling, and then check whether the _original_ string we got was "HEAD" (which it wasn't in this case). And that makes no sense; the dangling thing we found was not "HEAD^0" but rather "HEAD". Fixing this squelches a scary warning from "submodule summary HEAD" (and consequently "git status" with status.submodulesummary set) in an empty repo, as the submodule script calls "git rev-parse -q --verify HEAD^0". Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 17:03:58 UTC |
| 6977c25 | Larry D'Anna | 16 February 2010, 06:55:21 UTC | git diff --quiet -w: check and report the status The option -w tells the diff machinery to inspect the contents to set the exit status, instead of checking the blob object level difference alone. However, --quiet tells the diff machinery not to look at the contents, which means DIFF_FROM_CONTENTS has no chance to inspect the change. Work it around by calling diff_flush_patch() with output sent to /dev/null. Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 07:04:34 UTC |
| 460ccd0 | Thomas Rast | 15 February 2010, 16:05:46 UTC | stash pop: remove 'apply' options during 'drop' invocation The 'git stash pop' option parsing used to remove the first argument in --index mode. At the time this was implemented, this first argument was always --index. However, since the invention of the -q option in fcdd0e9 (stash: teach quiet option, 2009-06-17) you can cause an internal invocation of git stash drop --index by running git stash pop -q --index which then of course fails because drop doesn't know --index. To handle this, instead let 'git stash apply' decide what the future argument to 'drop' should be. Warning: this means that 'git stash apply' must parse all options that 'drop' can take, and deal with them in the same way. This is currently true for its only option -q. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Acked-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 05:46:27 UTC |
| 8324b97 | Larry D'Anna | 16 February 2010, 04:10:45 UTC | diff: make sure --output=/bad/path is caught The return value from fopen wasn't being checked. Signed-off-by: Larry D'Anna <larry@elder-gods.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 05:46:01 UTC |
| 7283bbc | Pete Harlan | 15 February 2010, 23:33:18 UTC | Remove hyphen from "git-command" in two error messages Signed-off-by: Pete Harlan <pgit@pcharlan.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 February 2010, 02:20:54 UTC |
| f6dff11 | Jonathan Nieder | 15 February 2010, 05:04:13 UTC | am: Fix launching of pager The pagination functionality in git am has some problems: - It does not check if stdout is a tty, so it always paginates. - If $GIT_PAGER uses any environment variables, they are being ignored, since it does not run $GIT_PAGER through eval. - If $GIT_PAGER is set to the empty string, instead of passing output through to stdout, it tries to run $dotest/patch. Fix them. While at it, move the definition of git_pager() to git-sh-setup so authors of other commands are not tempted to reimplement it with the same mistakes. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 06:05:17 UTC |
| b599672 | Junio C Hamano | 15 February 2010, 02:59:14 UTC | Merge branch 'maint-1.6.6' into maint * maint-1.6.6: fix minor memory leak in get_tree_entry() | 15 February 2010, 02:59:14 UTC |
| e6e592d | Jakub Narebski | 14 February 2010, 21:46:28 UTC | gitweb: Die if there are parsing errors in config file Otherwise the errors can propagate, and show in damnest places, and you would spend your time chasing ghosts instead of debugging real problem (yes, it is from personal experience). This follows (parts of) advice in `perldoc -f do` documentation. This required restructoring code a bit, so we die only if we are reading (executing) config file. As a side effect $GITWEB_CONFIG_SYSTEM is always available, even when we use $GITWEB_CONFIG. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 02:50:22 UTC |
| 190c1cd | Jonathan Nieder | 14 February 2010, 12:06:10 UTC | git svn: Fix launching of pager In commit dec543e (am -i, git-svn: use "git var GIT_PAGER"), I tried to teach git svn to defer to git var on what pager to use. In the process, I introduced two bugs: - The value set for $pager in config_pager has local scope, so run_pager never sees it; - git var cannot tell whether git svn’s output is going to a terminal, so the value chosen for $pager does not reflect that information. Fix them. Reported-by: Sebastian Celis <sebastian@sebastiancelis.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 02:23:17 UTC |
| 06300d9 | Jonathan Nieder | 14 February 2010, 12:02:35 UTC | git.1: Clarify the behavior of the --paginate option The --paginate option is meant to negate the effect of an explicit or implicit pager.<cmd> = false setting. Thus it turns the pager on if output is going to a terminal rather than unconditionally. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 02:23:17 UTC |
| 64778d2 | Jonathan Nieder | 14 February 2010, 11:59:59 UTC | Make 'git var GIT_PAGER' always print the configured pager Scripted commands that want to use git’s configured pager know better than ‘git var’ does whether stdout is going to be a tty at the appropriate time. Checking isatty(1) as git_pager() does now won’t cut it, since the output of git var itself is almost never a terminal. The symptom is that when used by humans, ‘git var GIT_PAGER’ behaves as it should, but when used by scripts, it always returns ‘cat’! So avoid tricks with isatty() and just always print the configured pager. This does not fix the callers to check isatty(1) themselves yet. Nevertheless, this patch alone is enough to fix 'am --interactive'. Thanks to Sebastian Celis for the report and Jeff King for the analysis. Reported-by: Sebastian Celis <sebastian@sebastiancelis.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 02:23:17 UTC |
| 9fabb6d | Jonathan Nieder | 14 February 2010, 11:55:53 UTC | Fix 'git var' usage synopsis The parameter to 'git var' is not optional. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 February 2010, 02:23:16 UTC |
| ef00650 | René Scharfe | 14 February 2010, 09:56:46 UTC | fix minor memory leak in get_tree_entry() Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 February 2010, 11:04:20 UTC |
| 9b25048 | Junio C Hamano | 13 February 2010, 23:04:00 UTC | Start 1.7.0 maintenance track Signed-off-by: Junio C Hamano <gitster@pobox.com> | 13 February 2010, 23:04:00 UTC |
| e923eae | Junio C Hamano | 12 February 2010, 23:45:05 UTC | Git 1.7.0 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:45:05 UTC |
| ca5812d | Junio C Hamano | 12 February 2010, 23:40:59 UTC | Merge branch 'maint' * maint: Fix typo in 1.6.6.2 release notes Re-fix check-ref-format documentation mark-up | 12 February 2010, 23:40:59 UTC |
| 341d9a4 | Junio C Hamano | 12 February 2010, 23:40:01 UTC | Fix typo in 1.6.6.2 release notes Of course, these are changes since 1.6.6.1; changes since 1.6.6.2 would have been nil. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:40:01 UTC |
| 8222153 | Junio C Hamano | 12 February 2010, 23:39:03 UTC | Re-fix check-ref-format documentation mark-up It is not double-backslash we forbid; backslashes are forbidden since a4c2e699 (Disallow '\' in ref names, 2009-05-08) Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 23:39:03 UTC |
| 67d1763 | Hitoshi Mitake | 12 February 2010, 11:36:12 UTC | git-imap-send: Convert LF to CRLF before storing patch to draft box When storing a message over IMAP (RFC 3501 6.3.11), the message should be in the format of an RFC 2822 message; most notably, CRLF must be used as a line terminator. Convert "\n" line endings in the payload to CRLF before feeding it to IMAP APPEND command. Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 19:21:28 UTC |
| 9b4c8b0 | Junio C Hamano | 10 February 2010, 20:33:58 UTC | archive documentation: attributes are taken from the tree by default By default, git-archive takes attributes from the tree being archived. People however often wonder why their attempts to affect the way how the command archives their tree by changing .gitattributes in their work tree fail. Add a bit of explanatory note to tell them how to achieve what they want to do. Noticed-by: Francois Marier Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:38:20 UTC |
| f937421 | Michael J Gruber | 12 February 2010, 09:47:53 UTC | Documentation: minor fixes to RelNotes-1.7.0 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:38:02 UTC |
| 85f6b43 | SZEDER Gábor | 12 February 2010, 14:11:47 UTC | bash: support 'git am's new '--continue' option Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 17:08:17 UTC |
| 618d18b | Junio C Hamano | 12 February 2010, 07:06:32 UTC | Merge branch 'maint' * maint: filter-branch: Fix error message for --prune-empty --commit-filter | 12 February 2010, 07:06:32 UTC |
| 5da8171 | Jacob Helwig | 12 February 2010, 02:46:22 UTC | filter-branch: Fix error message for --prune-empty --commit-filter Running filter-branch with --prune-empty and --commit-filter reports: "Cannot set --prune-empty and --filter-commit at the same time". Change it to use the correct option name: --commit-filter Signed-off-by: Jacob Helwig <jacob.helwig@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 06:12:36 UTC |
| 4d12888 | Jeff King | 11 February 2010, 21:19:37 UTC | cherry-pick: prettify the advice message It's hard to see the "how to commit" part of this message, which users may want to cut and paste. On top of that, having it in paragraph form means that a really long commit name may cause ugly wrapping. Let's make it prettier, like: Automatic cherry-pick failed. After resolving the conflicts, mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit the result with: git commit -c HEAD~23 Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 12 February 2010, 06:11:12 UTC |
