| d83a831 | Junio C Hamano | 03 April 2011, 07:12:31 UTC | Git 1.7.4.3 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2011, 07:12:31 UTC |
| c14f372 | Junio C Hamano | 03 April 2011, 06:08:13 UTC | Doc: mention --delta-base-offset is the default for Porcelain commands The underlying pack-objects plumbing command still needs an explicit option from the command line, but these days Porcelain passes the option, so there is no need for end users to worry about it anymore. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 April 2011, 06:08:13 UTC |
| 094574b | Junio C Hamano | 01 April 2011, 23:23:55 UTC | Merge branch 'nd/index-doc' into maint * nd/index-doc: doc: technical details about the index file format doc: technical details about the index file format | 01 April 2011, 23:23:55 UTC |
| 2aa5b6b | Junio C Hamano | 01 April 2011, 23:23:43 UTC | Merge branch 'pk/stash-apply-status-relative' into maint * pk/stash-apply-status-relative: Add test: git stash shows status relative to current dir git stash: show status relative to current directory | 01 April 2011, 23:23:43 UTC |
| bcf3d1f | Junio C Hamano | 01 April 2011, 23:23:34 UTC | Merge branch 'jc/maint-diff-q-filter' into maint * jc/maint-diff-q-filter: diff --quiet: disable optimization when --diff-filter=X is used | 01 April 2011, 23:23:34 UTC |
| bf87e09 | Junio C Hamano | 01 April 2011, 23:23:21 UTC | Merge branch 'js/maint-stash-index-copy' into maint * js/maint-stash-index-copy: stash: copy the index using --index-output instead of cp -p stash: fix incorrect quoting in cleanup of temporary files | 01 April 2011, 23:23:21 UTC |
| b7f6afe | Junio C Hamano | 01 April 2011, 23:23:15 UTC | Merge branch 'mg/doc-bisect-tweak-worktree' into maint * mg/doc-bisect-tweak-worktree: git-bisect.txt: example for bisecting with hot-fix git-bisect.txt: streamline run presentation | 01 April 2011, 23:23:15 UTC |
| ac53196 | Junio C Hamano | 01 April 2011, 23:20:45 UTC | Merge branch 'jh/maint-do-not-track-non-branches' into maint * jh/maint-do-not-track-non-branches: branch/checkout --track: Ensure that upstream branch is indeed a branch | 01 April 2011, 23:20:45 UTC |
| f35bb7c | Junio C Hamano | 01 April 2011, 23:20:24 UTC | Merge branch 'fk/maint-cvsimport-early-failure' into maint * fk/maint-cvsimport-early-failure: git-cvsimport.perl: Bail out right away when reading from the server fails | 01 April 2011, 23:20:24 UTC |
| 4584c94 | Junio C Hamano | 01 April 2011, 23:20:19 UTC | Merge branch 'jc/maint-apply-report-offset' into maint * jc/maint-apply-report-offset: apply -v: show offset count when patch did not apply exactly | 01 April 2011, 23:20:19 UTC |
| b46c9fa | Junio C Hamano | 01 April 2011, 23:20:11 UTC | Merge branch 'jc/maint-apply-no-double-patch' into maint * jc/maint-apply-no-double-patch: apply: do not patch lines that were already patched | 01 April 2011, 23:20:11 UTC |
| 46a1f07 | Junio C Hamano | 01 April 2011, 23:19:03 UTC | Merge branch 'js/checkout-untracked-symlink' into maint * js/checkout-untracked-symlink: do not overwrite untracked symlinks Demonstrate breakage: checkout overwrites untracked symlink with directory | 01 April 2011, 23:19:03 UTC |
| d12d8ec | Junio C Hamano | 01 April 2011, 23:16:23 UTC | Merge "checkout ambiguous ref bugfix" into maint * commit '0cb6ad3': checkout: fix bug with ambiguous refs | 01 April 2011, 23:16:51 UTC |
| 6cb0186 | Jeff King | 01 April 2011, 14:46:27 UTC | docs: fix filter-branch subdir example for exotic repo names The GIT_INDEX_FILE variable we get from git has the full path to the repo, which may contain spaces. When we use it in our shell snippet, it needs to be quoted. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 April 2011, 19:17:45 UTC |
| 2352570 | Junio C Hamano | 31 March 2011, 02:33:33 UTC | parse-remote: typofix An earlier patch had a trivial typo that two people did not notice. Pointed out by Michael Schubert. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 31 March 2011, 02:33:41 UTC |
| 806e0ab | Maxin john | 30 March 2011, 08:52:23 UTC | contrib/thunderbird-patch-inline: do not require bash to run the script The script does not have to be run under bash, but any POSIX compliant shell would do, as it does not use any bash-isms. It may be written under a different style than what is recommended in Documentation/CodingGuidelines, but that is a different matter. While at it, fix obvious typos in the comment. Signed-off-by: Maxin B. John <maxin@maxinbjohn.info> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 19:29:39 UTC |
| 4b705f4 | Junio C Hamano | 30 March 2011, 19:22:05 UTC | t8001: check the exit status of the command being tested Avoid running the command being tested as an upstream of a pipe; doing so will lose its exit status. While at it, modernise the style of the script. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 19:22:05 UTC |
| e039011 | Michael Witten | 15 February 2011, 23:12:04 UTC | strbuf.h: remove a tad stale docs-in-comment and reference api-doc instead Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 19:02:50 UTC |
| 63d3294 | Michael Witten | 22 February 2011, 17:15:00 UTC | Typos: t/README Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 18:59:52 UTC |
| 18b19e4 | Carlos Martín Nieto | 30 March 2011, 10:22:32 UTC | Documentation/config.txt: make truth value of numbers more explicit Change the order to 1/0 to have the same true/false order as the rest of the possibilities for a boolean variable in order not not confuse users. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 18:44:59 UTC |
| 2f8ee02 | Stephen Boyd | 30 March 2011, 09:00:06 UTC | git-pack-objects.txt: fix grammatical errors Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 18:43:15 UTC |
| 9ecd3ad | Stephen Boyd | 30 March 2011, 08:48:40 UTC | parse-remote: replace unnecessary sed invocation Just use parameter expansion instead. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 30 March 2011, 18:42:08 UTC |
| 90cff96 | Alex Riesen | 26 March 2011, 18:46:34 UTC | HOME must be set before calling git-init when creating test repositories Otherwise the created test repositories will be affected by users ~/.gitconfig. For example, setting core.logAllrefupdates in users config will make all calls to "git config --unset core.logAllrefupdates" fail which will break the first test which uses the statement and expects it to succeed. Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 29 March 2011, 08:13:36 UTC |
| f1723ee | Michael Witten | 28 March 2011, 15:11:49 UTC | git tag documentation grammar fixes and readability updates ... with help from Eric Raible. In addition, describe the use of GIT_COMMITTER_DATE more comprehensively by including "date-formats.txt" Signed-off-by: Michael Witten <mfwitten@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2011, 21:14:45 UTC |
| 7d6cb10 | Joe Ratterman | 28 March 2011, 18:11:55 UTC | grep: Add the option '--line-number' This is a synonym for the existing '-n' option, matching GNU grep. Signed-off-by: Joe Ratterman <jratt0@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 March 2011, 21:02:12 UTC |
| 78bc466 | Junio C Hamano | 26 March 2011, 00:56:14 UTC | Git 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 26 March 2011, 00:56:14 UTC |
| 2b1e172 | Jakub Narebski | 25 March 2011, 19:20:49 UTC | gitweb: Fix handling of fractional timezones in parse_date Fractional timezones, like -0330 (NST used in Canada) or +0430 (Afghanistan, Iran DST), were not handled properly in parse_date; this means values such as 'minute_local' and 'iso-tz' were not generated correctly. This was caused by two mistakes: * sign of timezone was applied only to hour part of offset, and not as it should be also to minutes part (this affected only negative fractional timezones). * 'int $h + $m/60' is 'int($h + $m/60)' and not 'int($h) + $m/60', so fractional part was discarded altogether ($h is hours, $m is minutes, which is always less than 60). Note that positive fractional timezones +0430, +0530 and +1030 can be found as authortime in git.git repository itself. For example http://repo.or.cz/w/git.git/commit/88d50e7 had authortime of "Fri, 8 Jan 2010 18:48:07 +0000 (23:48 +0530)", which is not marked with 'atnight', when "git show 88d50e7" gives correct author date of "Sat Jan 9 00:18:07 2010 +0530". Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 March 2011, 20:27:05 UTC |
| 23fcc98 | Junio C Hamano | 02 March 2011, 01:51:01 UTC | doc: technical details about the index file format * Clarify "string of unsigned bytes"; * Blob has two variants (regular file vs symlink), not (blob vs symlink); * Clarify permission mode bits; * Clarify ce_namelen() "too long to fit in the length field" case; * Clarify "." etc are forbidden as path components; * Match the description with the internal wording "cache-tree"; * All types of extension begin with signature and length as explained in the first part. Don't repeat the "length" part in the description of each extension (can be mistaken as if there is a separate 32-bit size field inside the extension), but state what the signature for each extension is. * Don't say "Extension tag", as we have said "Extension signature" in the first part---be consistent; * Clarify the invalidation of cache-tree entries; * Correct description on subtree_nr field in the cache-tree; * Clarify the order of entries in cache-tree; Signed-off-by: Junio C Hamano <gitster@pobox.com> | 23 March 2011, 22:57:10 UTC |
| b5f306f | SZEDER Gábor | 22 March 2011, 18:42:25 UTC | git-am.txt: advertise 'git am --abort' instead of 'rm .git/rebase-apply' 'git am --abort' is around for quite a long time now, and users should normally not poke around inside the .git directory, yet the documentation of 'git am' still recommends the following: ... if you decide to start over from scratch, run `rm -f -r .git/rebase-apply` ... Suggest 'git am --abort' instead. It's not quite the same as the original, because 'git am --abort' will restore the original branch, while simply removing '.git/rebase-apply' won't, but that's rather a thinko in the original wording, because that won't actually "start over _from scratch_". Signed-off-by: SZEDER Gábor <szeder@ira.uka.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 March 2011, 21:31:21 UTC |
| c4e4644 | Jeff King | 21 March 2011, 13:14:22 UTC | bisect: visualize with git-log if gitk is unavailable If gitk is not available in the PATH, bisect ends up exiting with the shell's 127 error code, confusing the git wrapper into thinking that bisect is not a git command. We already fallback to git-log if there doesn't seem to be a graphical display available. We should do the same if gitk is not available in our PATH at all. This not only fixes the ugly error message, but is a much more sensible default than failing to show the user anything. Reported by Maxin John. Tested-by: Maxin B. John <maxin@maxinbjohn.info> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 17:23:45 UTC |
| d98f24c | Junio C Hamano | 21 March 2011, 05:14:21 UTC | Update draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 05:14:21 UTC |
| 0bd20f1 | Junio C Hamano | 21 March 2011, 05:11:46 UTC | Merge branch 'sp/maint-fd-limit' into maint * sp/maint-fd-limit: sha1_file.c: Don't retain open fds on small packs mingw: add minimum getrlimit() compatibility stub Limit file descriptors used by packs | 21 March 2011, 05:11:46 UTC |
| dd7d0d0 | Junio C Hamano | 21 March 2011, 05:11:15 UTC | Merge branch 'mr/hpux' into maint * mr/hpux: git-compat-util.h: Honor HP C's noreturn attribute Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section | 21 March 2011, 05:11:15 UTC |
| 106040f | Junio C Hamano | 21 March 2011, 05:11:02 UTC | Merge branch 'so/submodule-no-update-first-time' into maint * so/submodule-no-update-first-time: t7406: "git submodule update {--merge|--rebase]" with new submodules submodule: no [--merge|--rebase] when newly cloned | 21 March 2011, 05:11:02 UTC |
| eec8a51 | Junio C Hamano | 21 March 2011, 05:10:31 UTC | Merge branch 'mo/perl-bidi-pipe-envfix' into maint * mo/perl-bidi-pipe-envfix: perl: command_bidi_pipe() method should set-up git environmens | 21 March 2011, 05:10:31 UTC |
| a8e04dd | Junio C Hamano | 21 March 2011, 05:09:39 UTC | Merge branch 'ae/better-template-failure-report' into maint * ae/better-template-failure-report: Improve error messages when temporary file creation fails | 21 March 2011, 05:09:39 UTC |
| c3786c8 | Ben Walton | 21 March 2011, 01:12:26 UTC | Work around broken ln on solaris as used in t8006 The test setup in t8006-blame-textconv.sh uses "ln -sf" to overwrite an existing symlink. Unfortunately, both /usr/bin/ln and /usr/xpg4/bin/ln on solaris 9 don't properly handle -f and -s used at the same time. This caused the test setup and subsequent checks to fail. Instead, remove the symlink and then create a new one in the setup code. The upstream Solaris bug (fixed in 10, but not 9) is documented here: http://bugs.opensolaris.org/view_bug.do?bug_id=4372462 Signed-off-by: Ben Walton <bwalton@artsci.utoronto.ca> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 04:58:09 UTC |
| 6eaf92f | Piotr Krukowiecki | 14 March 2011, 19:19:36 UTC | Add test: git stash shows status relative to current dir [jc: moved "cd subdir" inside subshell and fixed comparison with expected] Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 04:45:11 UTC |
| 9aec68d | Carlos Martín Nieto | 15 March 2011, 09:32:11 UTC | t/README: Add a note about running commands under valgrind The test suite runs valgrind with certain options activated. Add a note saying how to run commands under the same conditions as the test suite does. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 March 2011, 04:19:38 UTC |
| 6368d9f | Jakub Narebski | 19 March 2011, 22:53:55 UTC | gitweb: Always call parse_date with timezone parameter Timezone is required to correctly set local time, which would be needed for future 'localtime' feature. While at it, remove unnecessary call to the function from git_log_body, as its return value is not used anywhere. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:32 UTC |
| 958bf6b | Junio C Hamano | 20 March 2011, 04:46:06 UTC | bisect: explain the rationale behind 125 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 20 March 2011, 04:46:24 UTC |
| b547ce0 | Alexei Sholik | 18 March 2011, 13:14:27 UTC | docs: fix grammar in gitattributes.txt [jc: with a fixlet from Marc Branchaud] Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 18 March 2011, 16:58:47 UTC |
| 3ba2e86 | Johannes Sixt | 16 March 2011, 08:18:49 UTC | stash: copy the index using --index-output instead of cp -p 'git stash create' must operate with a temporary index. For this purpose, it used 'cp -p' to create a copy. -p is needed to preserve the timestamp of the index file. Now Jakob Pfender reported a certain combination of a Linux NFS client, OpenBSD NFS server, and cp implementation where this operation failed. Luckily, the first operation in git-stash after copying the index is to call 'git read-tree'. Therefore, use --index-output instead of 'cp -p' to write the copy of the index. --index-output requires that the specified file is on the same volume as the source index, so that the lock file can be rename()d. For this reason, the name of the temporary index is constructed in a way different from the other temporary files. The code path of 'stash -p' also needs a temporary index, but we do not use the new name because it does not depend on the same precondition as --index-output. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2011, 21:54:11 UTC |
| 23a32ff | Johannes Sixt | 16 March 2011, 08:14:33 UTC | stash: fix incorrect quoting in cleanup of temporary files The * was inside the quotes, so that the pattern was never expanded and the temporary files were never removed. As a consequence, 'stash -p' left a .git-stash-*-patch file in $GIT_DIR. Other code paths did not leave files behind because they removed the temporary file themselves, at least in non-error paths. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 17 March 2011, 21:53:10 UTC |
| fbcda3c | Junio C Hamano | 16 March 2011, 23:29:03 UTC | Prepare draft release notes to 1.7.4.2 Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:47:40 UTC |
| afb497d | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/maint-commit-missing-template' into maint * jn/maint-commit-missing-template: commit: error out for missing commit message template | 16 March 2011, 23:47:26 UTC |
| 43c1b6e | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'lt/rename-no-extra-copy-detection' into maint * lt/rename-no-extra-copy-detection: diffcore-rename: improve estimate_similarity() heuristics diffcore-rename: properly honor the difference between -M and -C for_each_hash: allow passing a 'void *data' pointer to callback | 16 March 2011, 23:47:26 UTC |
| 4e530c5 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/diffstat-binary' into maint * jk/diffstat-binary: diff: don't retrieve binary blobs for diffstat diff: handle diffstat of rewritten binary files | 16 March 2011, 23:47:26 UTC |
| 13a39e2 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'mg/maint-difftool-vim-readonly' into maint * mg/maint-difftool-vim-readonly: mergetool-lib: call vim in readonly mode for diffs | 16 March 2011, 23:47:26 UTC |
| c9b7cc0 | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jn/test-terminal-punt-on-osx-breakage' into maint * jn/test-terminal-punt-on-osx-breakage: tests: skip terminal output tests on OS X | 16 March 2011, 23:47:26 UTC |
| 8209b7f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jk/fail-null-clone' into maint * jk/fail-null-clone: clone: die when trying to clone missing local path | 16 March 2011, 23:47:26 UTC |
| 61a6f1f | Junio C Hamano | 16 March 2011, 23:47:26 UTC | Merge branch 'jh/push-default-upstream-configname' into maint * jh/push-default-upstream-configname: push.default: Rename 'tracking' to 'upstream' | 16 March 2011, 23:47:26 UTC |
| 7633a5a | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/placeholders-are-lowercase' into maint * mg/placeholders-are-lowercase: Make <identifier> lowercase in Documentation Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines Make <identifier> lowercase as per CodingGuidelines CodingGuidelines: downcase placeholders in usage messages | 16 March 2011, 23:47:25 UTC |
| bd2700d | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'mg/patch-id' into maint * mg/patch-id: git-patch-id: do not trip over "no newline" markers git-patch-id: test for "no newline" markers | 16 March 2011, 23:47:25 UTC |
| 5b8aac3 | Junio C Hamano | 16 March 2011, 23:47:25 UTC | Merge branch 'js/maint-merge-use-prepare-commit-msg-hook' into maint * js/maint-merge-use-prepare-commit-msg-hook: merge: honor prepare-commit-msg hook | 16 March 2011, 23:47:25 UTC |
| 6affdbe | Kevin Cernekee | 16 March 2011, 22:34:13 UTC | gitweb: highlight: replace tabs with spaces Consider the following code fragment: /* * test */ vim ":set list" mode shows that the first character on each line is a tab: ^I/*$ ^I * test$ ^I */$ By default, the "highlight" program will retain the tabs in the HTML output: $ highlight --fragment --syntax c test.c <span class="hl com">/*</span> <span class="hl com"> * test</span> <span class="hl com"> */</span> vim list mode: ^I<span class="hl com">/*</span>$ <span class="hl com">^I * test</span>$ <span class="hl com">^I */</span>$ In gitweb, this winds up looking something like: 1 /* 2 * test 3 */ I tried both Firefox and Opera and saw the same behavior. The desired output is: 1 /* 2 * test 3 */ This can be accomplished by specifying "--replace-tabs=8" on the highlight command line. Signed-off-by: Kevin Cernekee <cernekee@gmail.com> Acked-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 23:18:58 UTC |
| 2cfe8a6 | Junio C Hamano | 16 March 2011, 22:46:08 UTC | diff --quiet: disable optimization when --diff-filter=X is used The code notices that the caller does not want any detail of the changes and only wants to know if there is a change or not by specifying --quiet. And it breaks out of the loop when it knows it already found any change. When you have a post-process filter (e.g. --diff-filter), however, the path we found to be different in the previous round and set HAS_CHANGES bit may end up being uninteresting, and there may be no output at the end. The optimization needs to be disabled for such case. Note that the f245194 (diff: change semantics of "ignore whitespace" options, 2009-05-22) already disables this optimization by refraining from setting HAS_CHANGES when post-process filters that need to inspect the contents of the files (e.g. -S, -w) in diff_change() function. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 22:57:19 UTC |
| 1d679de | Carlos Martín Nieto | 16 March 2011, 16:06:17 UTC | make_absolute_path: return the input path if it points to our buffer Some codepaths call make_absolute_path with its own return value as input. In such a cases, return the path immediately. This fixes a valgrind-discovered error, whereby we tried to copy a string onto itself. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:51:22 UTC |
| b406a2d | Carlos Martín Nieto | 16 March 2011, 11:46:01 UTC | valgrind: ignore SSE-based strlen invalid reads Some versions of strlen use SSE to speed up the calculation and load 4 bytes at a time, even if it means reading past the end of the allocated memory. This read is safe and when the strlen function is inlined, it is not replaced by valgrind, which reports a false-possitive. Tell valgrind to ignore this particular error, as the read is, in fact, safe. Current upstream-released version 3.6.1 is affected. Some distributions have this fixed in their latest versions. Signed-off-by: Carlos Martín Nieto <cmn@elego.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 20:19:56 UTC |
| 808a95d | Jonathan Nieder | 16 March 2011, 07:14:11 UTC | diff --submodule: split into bite-sized pieces Introduce two functions: - prepare_submodule_summary prepares the revision walker to list changes in a submodule. That is, it: * finds merge bases between the commits pointed to this path from before ("left") and after ("right") the change; * checks whether this is a fast-forward or fast-backward; * prepares a revision walk to list commits in the symmetric difference between the commits at each endpoint. It returns nonzero on error. - print_submodule_summary runs the revision walk and saves the result to a strbuf in --left-right format. The goal is just readability. No functional change intended. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jens Lehmann <Jens.Lehmann@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:55:49 UTC |
| a3a32e7 | Jonathan Nieder | 16 March 2011, 07:12:48 UTC | cherry: split off function to print output lines Readers uninterested in the details of "git cherry"'s output format can see print_commit('-', commit, verbose, abbrev); and ignore the details. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:54:44 UTC |
| 6e0332e | Jonathan Nieder | 16 March 2011, 07:10:14 UTC | branch: split off function that writes tracking info and commit subject Introduce a add_verbose_info function that takes care of adding - an abbreviated object name; - a summary of the form [ahead x, behind y] of the relationship to the corresponding upstream branch; - a one line commit subject for the tip commit of a branch, for use in "git branch -v" output. No functional change intended. This just unindents the code a little and makes it easier to skip on first reading. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:52:15 UTC |
| 9cba13c | Jonathan Nieder | 16 March 2011, 07:08:34 UTC | standardize brace placement in struct definitions In a struct definitions, unlike functions, the prevailing style is for the opening brace to go on the same line as the struct name, like so: struct foo { int bar; char *baz; }; Indeed, grepping for 'struct [a-z_]* {$' yields about 5 times as many matches as 'struct [a-z_]*$'. Linus sayeth: Heretic people all over the world have claimed that this inconsistency is ... well ... inconsistent, but all right-thinking people know that (a) K&R are _right_ and (b) K&R are right. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:49:02 UTC |
| c6c8d0b | Jonathan Nieder | 16 March 2011, 07:00:49 UTC | compat: make gcc bswap an inline function Without this change, gcc -pedantic warns: cache.h: In function 'ce_to_dtype': cache.h:270:21: warning: ISO C forbids braced-groups within expressions [-pedantic] An inline function is more readable anyway. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:44:59 UTC |
| c9b6782 | Jonathan Nieder | 16 March 2011, 06:59:10 UTC | enums: omit trailing comma for portability Since v1.7.2-rc0~23^2~2 (Add per-repository eol normalization, 2010-05-19), building with gcc -std=gnu89 -pedantic produces warnings like the following: convert.c:21:11: warning: comma at end of enumerator list [-pedantic] gcc is right to complain --- these commas are not permitted in C89. In the spirit of v1.7.2-rc0~32^2~16 (2010-05-14), remove them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 16 March 2011, 19:31:32 UTC |
| e235b91 | Michael J Gruber | 15 March 2011, 21:24:56 UTC | git-bisect.txt: example for bisecting with hot-fix Give an example on how to bisect when older revisions need a hot-fix to build, run or test. Triggered by the binutils/kernel issue at http://thread.gmane.org/gmane.comp.gnu.binutils/52601/focus=1112779 Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2011, 23:06:08 UTC |
| 9d79b7e | Michael J Gruber | 15 March 2011, 21:24:55 UTC | git-bisect.txt: streamline run presentation Streamline the presentation of "bisect run" by removing one example which does not introduce new concepts. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 15 March 2011, 23:06:05 UTC |
| 26b59b4 | Piotr Krukowiecki | 12 March 2011, 08:57:46 UTC | git stash: show status relative to current directory git status shows modified paths relative to current directory, so it's possible to copy&paste them directly, even if you're in a subdirectory. But "git stash apply" always shows status from root of git repository. This is misleading because you can't use the paths without modifications. This is caused by changing directory to root of repository at the beginning of git stash. This patch makes git stash show status relative to current directory. Instead of removing the "cd to toplevel", which would affect whole script and might have other side-effects, the fix is to change directory temporarily back to original dir just before displaying status. Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 14 March 2011, 07:28:37 UTC |
| ea2c69e | Junio C Hamano | 11 March 2011, 06:41:14 UTC | Revert "core.abbrevguard: Ensure short object names stay unique a bit longer" This reverts commit 72a5b561fc1c4286bc7c5b0693afc076af261e1f, as adding fixed number of hexdigits more than necessary to make one object name locally unique does not help in futureproofing the uniqueness of names we generate today. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 11 March 2011, 06:41:14 UTC |
| 681186a | Mathias Lafeldt | 09 March 2011, 20:25:09 UTC | Fix typo in t/README Signed-off-by: Mathias Lafeldt <misfire@debugon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:53:13 UTC |
| 494489a | Piotr Krukowiecki | 09 March 2011, 20:03:48 UTC | ls-remote documentation: <refs> argument is optional Correct SYNOPSIS section. Signed-off-by: Piotr Krukowiecki <piotr.krukowiecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:32:00 UTC |
| 621c39d | Alexei Sholik | 08 March 2011, 13:16:10 UTC | Add Author and Documentation sections to git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 20:22:15 UTC |
| 22817b4 | Alexei Sholik | 08 March 2011, 13:16:09 UTC | Documentation: remove redundant colons in git-for-each-ref.txt Signed-off-by: Alexei Sholik <alcosholik@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 19:54:56 UTC |
| d0f7dcb | Junio C Hamano | 09 March 2011, 00:58:19 UTC | SubmittingPatches: clarify the expected commit log description Earlier, 47afed5 (SubmittingPatches: itemize and reflect upon well written changes, 2009-04-28) added a discussion on the contents of the commit log message, but the last part of the new paragraph didn't make much sense. Reword it slightly to make it more readable. Update the "quicklist" to clarify what we mean by "motivation" and "contrast". Also mildly discourage external references. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 09 March 2011, 05:35:22 UTC |
| e0adb84 | Adam Monsen | 08 March 2011, 20:51:37 UTC | diff format documentation: clarify --cc and -c The description was unclear if -c or --cc was the default (--cc is for some commands), and incorrectly implied that the default applies to all the diff generating commands. Most importantly, "log" does not default to "--cc" (it defaults to "--no-merges") and "log -p" obeys the user's wish to see non-combined format. Only "diff" (during merge and three-blob comparison) and "show" use --cc as the default. Signed-off-by: Adam Monsen <haircut@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 22:44:07 UTC |
| 841d811 | Michael J Gruber | 08 March 2011, 08:31:24 UTC | rev-list-options.txt: typo fix Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 19:56:37 UTC |
| b6ab349 | Michal Rokos | 07 March 2011, 12:13:15 UTC | git-compat-util.h: Honor HP C's noreturn attribute HP C for Integrity servers (Itanium) gained support for noreturn attribute sometime in 2006. It was released in Compiler Version A.06.10 and made available in July 2006. The __HP_cc define detects the HP C compiler version. Precede the __GNUC__ check so it works well when compiling with HP C using -Agcc option that enables partial support for the GNU C dialect. The -Agcc defines the __GNUC__ too. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 18:58:00 UTC |
| 987893d | Michal Rokos | 07 March 2011, 11:43:11 UTC | Makefile: add NO_FNMATCH_CASEFOLD to HP-UX section fnmatch() on HP-UX does not support the GNU FNM_CASEFOLD extension, so set NO_FNMATCH_CASEFOLD to use the internal fnmatch implementation. Signed-off-by: Michal Rokos <michal.rokos@nextsoft.cz> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 08 March 2011, 18:57:35 UTC |
| 334f8cb | Junio C Hamano | 04 March 2011, 22:43:45 UTC | apply -v: show offset count when patch did not apply exactly When the line number the patch intended to touch does not match the line in the version being patched, GNU patch reports that it applied the hunk at a different line number, with how big an offset. Teach "git apply" to do the same under --verbose option. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 06 March 2011, 22:02:45 UTC |
| 9d15860 | Junio C Hamano | 04 March 2011, 20:25:34 UTC | apply: do not patch lines that were already patched When looking for a place to apply a hunk, we used to check lines that match the preimage of it, starting from the line that the patch wants to apply the hunk at, looking forward and backward with increasing offsets until we find a match. Colin Guthrie found an interesting case where this misapplied a patch that wanted to touch a preimage that consists of } } return 0; } which is a rather unfortunately common pattern. The target version of the file originally had only one such location, but the hunk immediately before that created another instance of such block of lines, and find_pos() happily reported that the preimage of the hunk matched what it wanted to modify. Oops. By marking the lines application of earlier hunks touched and preventing match_fragment() from considering them as a match with preimage of other hunks, we can reduce such an accident. I also considered to teach apply_one_fragment() to take the offset we have found while applying the previous hunk into account when looking for a match with find_pos(), but dismissed that approach, because it would sometimes work better but sometimes worse, depending on the difference between the version the patch was created against and the version the patch is being applied. This does _not_ prevent misapplication of patches to a file that has many similar looking blocks of lines and a preimage cannot identify which one of them should be applied. For that, we would need to scan beyond the first match in find_pos(), and issue a warning (or error out). That will be a separate topic. Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2011, 22:47:18 UTC |
| 964498e | Michał Kiedrowicz | 03 March 2011, 09:28:30 UTC | Documentation: fix a typo in git-apply.txt git-apply accepts the --cached option, not --cache. Signed-off-by: Michał Kiedrowicz <michal.kiedrowicz@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 04 March 2011, 18:05:00 UTC |
| b31d202 | Nguyễn Thái Ngọc Duy | 03 March 2011, 12:34:51 UTC | init: remove unnecessary check git_dir must always be non-NULL so "if (git_dir)" is unnecessary. Before this code, if git_dir == NULL, it will default to DEFAULT_GIT_DIR_ENVIRONMENT. Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 03 March 2011, 23:45:10 UTC |
| d131b7a | Shawn O. Pearce | 02 March 2011, 18:01:54 UTC | sha1_file.c: Don't retain open fds on small packs If a pack file is small enough that its entire contents fits within one mmap window, mmap the file and then immediately close its file descriptor. This reduces the number of file descriptors that are needed to read from repositories with many tiny pack files, such as one that has received 1000 pushes (and created 1000 small pack files) since its last repack. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 02 March 2011, 19:25:30 UTC |
| 38abd9b | Erik Faye-Lund | 28 February 2011, 21:13:22 UTC | mingw: add minimum getrlimit() compatibility stub We don't have getrlimit on Windows :( Limit of 2048 taken from MSDN: http://msdn.microsoft.com/en-us/library/6e3b887c(v=vs.71).aspx Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> | 02 March 2011, 19:24:20 UTC |
| ec48d4b | Junio C Hamano | 01 March 2011, 19:26:22 UTC | verify-pack: add --stat-only to the synopsis section Signed-off-by: Junio C Hamano <gitster@pobox.com> | 01 March 2011, 19:26:22 UTC |
| c793430 | Shawn O. Pearce | 28 February 2011, 20:52:39 UTC | Limit file descriptors used by packs Rather than using 'errno == EMFILE' after a failed open() call to indicate the process is out of file descriptors and an LRU pack window should be closed, place a hard upper limit on the number of open packs based on the actual rlimit of the process. By using a hard upper limit that is below the rlimit of the current process it is not necessary to check for EMFILE on every single fd-allocating system call. Instead reserving 25 file descriptors makes it safe to assume the system call won't fail due to being over the filedescriptor limit. Here 25 is chosen as a WAG, but considers 3 for stdin/stdout/stderr, and at least a few for other Git code to operate on temporary files. An additional 20 is reserved as it is not known what the C library needs to perform other services on Git's behalf, such as nsswitch or name resolution. This fixes a case where running `git gc --auto` in a repository with more than 1024 packs (but an rlimit of 1024 open fds) fails due to the temporary output file not being able to allocate a file descriptor. The output file is opened by pack-objects after object enumeration and delta compression are done, both of which have already opened all of the packs and fully populated the file descriptor table. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 28 February 2011, 21:08:31 UTC |
| e7cad3c | Fabian Keil | 31 January 2011, 19:29:46 UTC | git-cvsimport.perl: Bail out right away when reading from the server fails If the CVS server is down, this reduced the git-cvsimport output from: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Use of uninitialized value $rep in scalar chomp at /usr/local/libexec/git-core/git-cvsimport line 369. Use of uninitialized value $rep in substitution (s///) at /usr/local/libexec/git-core/git-cvsimport line 370. Expected Valid-requests from server, but got: <unknown> to the less noisy: ssh: connect to host ijbswa.cvs.sourceforge.net port 22: Connection refused Failed to read from server at /usr/local/libexec/git-core/git-cvsimport line 370. In this case a silent exit() instead of the die() would probably do, but I assume that there could be cases where the connection attempt succeeds, but reading from the server fails for other reasons. Signed-off-by: Fabian Keil <fk@fabiankeil.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 10:13:21 UTC |
| 8c7d051 | Nguyễn Thái Ngọc Duy | 06 September 2010, 10:37:10 UTC | doc: technical details about the index file format This bases on the original work by Robin Rosenberg. Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 09:21:27 UTC |
| 62270f6 | Eric Hanchrow | 26 February 2011, 03:29:42 UTC | branch_merged: fix grammar in warning Signed-off-by: Eric Hanchrow <eric.hanchrow@gmail.com> Helped-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 27 February 2011, 08:29:58 UTC |
| 2140b14 | Jonathan Nieder | 25 February 2011, 09:07:57 UTC | commit: error out for missing commit message template When "git commit" was rewritten in C (v1.5.4-rc0~78^2~30, 2007-11-08), a subtle bug in --template was introduced. If the file named by a --template parameter is missing, previously git would error out with a message: Commit template file does not exist. but in the C version the --template parameter gets ignored and the default template is used. t7500 has two tests for this case which would have caught it, except that with the default $EDITOR, the commit message template is left unmodified, causing 'git commit' to error out and the test to succeed. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2011, 20:13:55 UTC |
| 853c0ff | Michael J Gruber | 25 February 2011, 09:36:39 UTC | mergetool-lib: call vim in readonly mode for diffs When [g]vimdiff is called for files which are opened already, the editor complains about the existing swap file. But we do not want to write anything when called from difftool. So, make difftool use "-R" for the vim family. This - prevents the use of a swap file and - marks the buffers readonly. Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 25 February 2011, 20:00:28 UTC |
| abb371a | Jeff King | 19 February 2011, 08:16:32 UTC | diff: don't retrieve binary blobs for diffstat We only need the size, which is much cheaper to get, especially if it is a big binary file. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 18:58:18 UTC |
| ded0abc | Jeff King | 19 February 2011, 08:04:56 UTC | diff: handle diffstat of rewritten binary files The logic in builtin_diffstat assumes that a complete_rewrite pair should have its lines counted. This is nonsensical for binary files and leads to confusing things like: $ git diff --stat --summary HEAD^ HEAD foo.rand | Bin 4096 -> 4096 bytes 1 files changed, 0 insertions(+), 0 deletions(-) $ git diff --stat --summary -B HEAD^ HEAD foo.rand | 34 +++++++++++++++------------------- 1 files changed, 15 insertions(+), 19 deletions(-) rewrite foo.rand (100%) So let's reorder the function to handle binary files first (which from diffstat's perspective look like complete rewrites anyway), then rewrites, then actual diffstats. There are two bonus prizes to this reorder: 1. It gets rid of a now-superfluous goto. 2. The binary case is at the top, which means we can further optimize it in the next patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 18:57:58 UTC |
| 1d718a5 | Clemens Buchacher | 20 February 2011, 12:13:43 UTC | do not overwrite untracked symlinks Git traditionally overwrites untracked symlinks silently. This will generally not cause massive data loss, but it is inconsistent with the behavior for regular files, which are not silently overwritten. With this change, git refuses to overwrite untracked symlinks by default. If the user really wants to overwrite the untracked symlink, he has git-clean and git-checkout -f at his disposal. Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 06:51:07 UTC |
| 4cc6260 | Clemens Buchacher | 21 February 2011, 20:05:25 UTC | Documentation: clarify -u<mode> option defaults Signed-off-by: Clemens Buchacher <drizzd@aon.at> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 22 February 2011, 05:48:55 UTC |
| d5a719e | Ævar Arnfjörð Bjarmason | 19 February 2011, 18:29:09 UTC | t/t7500-commit.sh: use test_cmp instead of test Change commit_msg_is() in t/t7500-commit.sh to use test_cmp instead of the shell's test function. Now if a test fails we'll get test_cmp output showing us what failed. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:55:53 UTC |
| 49151d8 | Ævar Arnfjörð Bjarmason | 19 February 2011, 18:16:19 UTC | t/gitweb-lib.sh: Ensure that errors are shown for --debug --immediate Because '--immediate' stops test suite after first error, therefore in this mode test_debug 'cat gitweb.log' was never ran, thus in effect negating effect of '--debug' option. This made finidng the cause of errors in gitweb test sute difficult. Modify the gitweb_run test subroutine to run test_debug itself in the case of errors (and also remove "test_debug 'cat gitweb.log'" from gitweb tests). This makes it possible to run *gitweb tests* with --immediate ---debug combination of options; also it makes gitweb tests to not output spurious debug data that is not considered error. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:38:40 UTC |
| 98885c2 | Ævar Arnfjörð Bjarmason | 19 February 2011, 15:27:42 UTC | gitweb/gitweb.perl: don't call S_ISREG() with undef Change S_ISREG($to_mode_oct) to S_ISREG($from_mode_oct) in the branch that handles from modes, not to modes. This logic appears to have been caused by copy/paste programming by Jakub Narebski in e8e41a93. It would be better to rewrite this code not to be duplicated, but I haven't done so. This issue caused a failing test on perl 5.13.9, which has a warning that turned this up: gitweb.perl: Use of uninitialized value in subroutine entry at /home/avar/g/git/t/../gitweb/gitweb.perl line 4415. Which caused the Git test suite to fail on this test: ./t9500-gitweb-standalone-no-errors.sh (Wstat: 256 Tests: 90 Failed: 84) Failed tests: 1-8, 10-36, 38-45, 47-48, 50-88 Non-zero exit status: 1 Reported-by: perl 5.13.9 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:37:31 UTC |
| 0f54b7d | Ævar Arnfjörð Bjarmason | 19 February 2011, 15:27:41 UTC | gitweb/gitweb.perl: remove use of qw(...) as parentheses Using the qw(...) construct as implicit parentheses was deprecated in perl 5.13.5. Change the relevant code in gitweb to not use the deprecated construct. The offending code was introduced in 3562198b by Jakub Narebski. The issue is that perl will now warn about this: $ perl -wE 'for my $i qw(a b) { say $i }' Use of qw(...) as parentheses is deprecated at -e line 1. a b This caused gitweb.perl to warn on perl 5.13.5 and above, and these tests to fail on those perl versions: ./t9501-gitweb-standalone-http-status.sh (Wstat: 256 Tests: 11 Failed: 10) Failed tests: 2-11 Non-zero exit status: 1 ./t9502-gitweb-standalone-parse-output.sh (Wstat: 256 Tests: 10 Failed: 9) Failed tests: 2-10 Non-zero exit status: 1 Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Acked-by: Jakub Narębski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 21 February 2011, 18:36:56 UTC |
| 3a4d676 | Linus Torvalds | 19 February 2011, 04:12:06 UTC | diffcore-rename: improve estimate_similarity() heuristics The logic to quickly dismiss potential rename pairs was broken. It would too eagerly dismiss possible renames when all of the difference was due to pure new data (or deleted data). Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Junio C Hamano <gitster@pobox.com> | 19 February 2011, 06:26:45 UTC |
