diff options
| author | David Aguilar <davvid@gmail.com> | 2016-03-09 23:13:58 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-03-10 14:07:13 -0800 |
| commit | faaab8d571633fc8d98f58f02862f1d0bfa988f7 (patch) | |
| tree | e7640a245227c1cf97bf49298c03776d6a8e529d /git-mergetool.sh | |
| parent | 326e5bc91eecf73234ead29636207bc516573e79 (diff) | |
| download | git-faaab8d571633fc8d98f58f02862f1d0bfa988f7.tar.gz | |
mergetool: support delete/delete conflicts
If two branches each move a file into different directories then
mergetool will fail because it assumes that the file being merged, and
its parent directory, are present in the worktree.
Create the merge file's parent directory to allow using the
deleted base version of the file for merge resolution when
encountering a delete/delete conflict.
The end result is that a delete/delete conflict is presented for the
user to resolve.
Reported-by: Joe Einertson <joe@kidblog.org>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
| -rwxr-xr-x | git-mergetool.sh | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/git-mergetool.sh b/git-mergetool.sh index 9f77e3a8bb..b06ae78739 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -282,8 +282,14 @@ merge_file () { return fi - mv -- "$MERGED" "$BACKUP" - cp -- "$BACKUP" "$MERGED" + if test -f "$MERGED" + then + mv -- "$MERGED" "$BACKUP" + cp -- "$BACKUP" "$MERGED" + fi + # Create a parent directory to handle delete/delete conflicts + # where the base's directory no longer exists. + mkdir -p "$(dirname "$MERGED")" checkout_staged_file 1 "$MERGED" "$BASE" checkout_staged_file 2 "$MERGED" "$LOCAL" @@ -295,7 +301,9 @@ merge_file () { describe_file "$local_mode" "local" "$LOCAL" describe_file "$remote_mode" "remote" "$REMOTE" resolve_deleted_merge - return + status=$? + rmdir -p "$(dirname "$MERGED")" 2>/dev/null + return $status fi if is_symlink "$local_mode" || is_symlink "$remote_mode" |