diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:52:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-17 15:52:32 -0700 |
| commit | 992311cf860347df159081873fba099a94d463f4 (patch) | |
| tree | 38b7b29c984070d76a0aa6900d71135e3023bbd5 /t | |
| parent | Draft release notes to 1.8.0 (diff) | |
| parent | blame: allow "blame file" in the middle of a conflicted merge (diff) | |
| download | tgif-992311cf860347df159081873fba099a94d463f4.tar.xz | |
Merge branch 'jc/maint-blame-no-such-path'
"git blame MAKEFILE" run in a history that has "Makefile" but not
"MAKEFILE" should say "No such file MAKEFILE in HEAD", but got
confused on a case insensitive filesystem and failed to do so.
Even during a conflicted merge, "git blame $path" always meant to
blame uncommitted changes to the "working tree" version; make it
more useful by showing cleanly merged parts as coming from the other
branch that is being merged.
* jc/maint-blame-no-such-path:
blame: allow "blame file" in the middle of a conflicted merge
blame $path: avoid getting fooled by case insensitive filesystems
Diffstat (limited to 't')
| -rwxr-xr-x | t/t8004-blame-with-conflicts.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh index ba19ac127e..9c353ab222 100755 --- a/t/t8004-blame-with-conflicts.sh +++ b/t/t8004-blame-with-conflicts.sh @@ -66,7 +66,7 @@ test_expect_success \ git blame file2 ' -test_expect_success 'blame runs on conflicted file in stages 1,3' ' +test_expect_success 'blame does not crash with conflicted file in stages 1,3' ' git blame file1 ' |