aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-09-24 12:40:02 -0700
committerJunio C Hamano <gitster@pobox.com>2012-09-24 12:40:02 -0700
commit140011d8f2d17b050942e8a4bb33ecbd6827df2e (patch)
tree3aca098774bb7364b3b861a5c5e67990f660e9d6 /t
parent8144049d79f2678eb6cee7bb9070341e3fcfe282 (diff)
parent9aeaab6811dce596b4f6141d76f5300359bfd009 (diff)
downloadgit-140011d8f2d17b050942e8a4bb33ecbd6827df2e.tar.gz
git-140011d8f2d17b050942e8a4bb33ecbd6827df2e.tar.xz
Merge branch 'jc/maint-blame-no-such-path' into maint
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. This incidentally fixes an unrelated problem on a case insensitive filesystem, where "git blame MAKEFILE" run in a history that has "Makefile" but not "MAKEFILE" did not say "No such file MAKEFILE in HEAD" but pretended as if "MAKEFILE" was a newly added file. * 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-xt/t8004-blame-with-conflicts.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t8004-blame-with-conflicts.sh b/t/t8004-blame-with-conflicts.sh
index ba19ac127..9c353ab22 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
'