mirror of
https://github.com/git/git.git
synced 2024-11-18 04:53:58 +01:00
b26d87f2da
The current message printed by "git merge-recursive" for a rename/delete conflict is like this: CONFLICT (rename/delete): new-path deleted in HEAD and renamed in other-branch. Version other-branch of new-path left in tree. To be more helpful, the message should show both paths of the rename and state that the deletion occurred at the old path, not the new path. So change the message to the following format: CONFLICT (rename/delete): old-path deleted in HEAD and renamed to new-path in other-branch. Version other-branch of new-path left in tree. Since this doubles the number of cases in handle_change_delete (modify vs. rename), refactor the code to halve the number of cases again by merging the cases where o->branch1 has the change and o->branch2 has the delete with the cases that are the other way around. Also add a simple test of the new conflict message. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
24 lines
534 B
Bash
Executable File
24 lines
534 B
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='Merge-recursive rename/delete conflict message'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'rename/delete' '
|
|
echo foo >A &&
|
|
git add A &&
|
|
git commit -m "initial" &&
|
|
|
|
git checkout -b rename &&
|
|
git mv A B &&
|
|
git commit -m "rename" &&
|
|
|
|
git checkout master &&
|
|
git rm A &&
|
|
git commit -m "delete" &&
|
|
|
|
test_must_fail git merge --strategy=recursive rename >output &&
|
|
test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
|
|
'
|
|
|
|
test_done
|