• Junio C Hamano's avatar
    blame: allow "blame file" in the middle of a conflicted merge · 9aeaab68
    Junio C Hamano authored
    "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: default avatarJunio C Hamano <gitster@pobox.com>
t8004-blame-with-conflicts.sh 1.53 KB