global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-04-11 09:20:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/maint-blame-no-such-path' into maint

Browse Source 
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
This commit is contained in:
Junio C Hamano
2012-09-24 12:40:02 -07:00
parent 8144049d79 9aeaab6811
commit 140011d8f2
2 changed files with 74 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/t8004-blame-with-conflicts.sh
View File

@@ -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
'