• D
    merge-recursive.c: fix case-changing merge bug · ae352c7f
    David Turner 提交于
    On a case-insensitive filesystem, when merging, a file would be
    wrongly deleted from the working tree if an incoming commit had
    renamed it changing only its case.  When merging a rename, the file
    with the old name would be deleted -- but since the filesystem
    considers the old name to be the same as the new name, the new
    file would in fact be deleted.
    
    We avoid this by not deleting files that have a case-clone in the
    index at stage 0.
    Signed-off-by: NDavid Turner <dturner@twitter.com>
    Signed-off-by: NJunio C Hamano <gitster@pobox.com>
    ae352c7f
t6039-merge-ignorecase.sh 1.3 KB