diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 14:30:03 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 14:30:03 -0700 |
| commit | 9aeaab6811dce596b4f6141d76f5300359bfd009 (patch) | |
| tree | cb2e3cd727dbb35eef5a422a8c6b540b1af476ac /t | |
| parent | ffcabccf5df17f12997feedafefeb5589b8c0511 (diff) | |
| download | git-9aeaab6811dce596b4f6141d76f5300359bfd009.tar.gz git-9aeaab6811dce596b4f6141d76f5300359bfd009.tar.xz | |
blame: allow "blame file" in the middle of a conflicted merge
"git blame file" has always meant "find the origin of each line of
the file in the history leading to HEAD, oh by the way, blame the
lines that are modified locally to the working tree".
This teaches "git blame" that during a conflicted merge, some
uncommitted changes may have come from the other history that is
being merged.
The verify_working_tree_path() function introduced in the previous
patch to notice a typo in the filename (primarily on case insensitive
filesystems) has been updated to allow a filename that does not exist
in HEAD (i.e. the tip of our history) as long as it exists one of the
commits being merged, so that a "we deleted, the other side modified"
case tracks the history of the file in the history of the other side.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 b4a260a0f..9c353ab22 100755 --- a/t/t8004-blame-with-conflicts.sh +++ b/t/t8004-blame-with-conflicts.sh @@ -67,7 +67,7 @@ test_expect_success \ ' test_expect_success 'blame does not crash with conflicted file in stages 1,3' ' - test_must_fail git blame file1 + git blame file1 ' test_done |