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>
David Aguilar committed
Mar 9, 2016 at 23:13 UTC
faaab8d571633fc8d98f58f02862f1d0bfa988f7
2 files changed
+50
-3
git-mergetool.sh
+11
-3
@@ -282,8 +282,14 @@ merge_file () {
282
return
283
fi
284
285
- mv -- "$MERGED" "$BACKUP"
286
- cp -- "$BACKUP" "$MERGED"
285
+ if test -f "$MERGED"
286
+ then
287
+ mv -- "$MERGED" "$BACKUP"
288
+ cp -- "$BACKUP" "$MERGED"
289
+ fi
290
+ # Create a parent directory to handle delete/delete conflicts
291
+ # where the base's directory no longer exists.
292
+ mkdir -p "$(dirname "$MERGED")"
293
294
checkout_staged_file 1 "$MERGED" "$BASE"
295
checkout_staged_file 2 "$MERGED" "$LOCAL"
@@ -295,7 +301,9 @@ merge_file () {
301
describe_file "$local_mode" "local" "$LOCAL"
302
describe_file "$remote_mode" "remote" "$REMOTE"
303
resolve_deleted_merge
298
- return
304
+ status=$?
305
+ rmdir -p "$(dirname "$MERGED")" 2>/dev/null
306
+ return $status
307
fi
308
309
if is_symlink "$local_mode" || is_symlink "$remote_mode"
t/t7610-mergetool.sh
+39
@@ -243,6 +243,45 @@ test_expect_success 'mergetool takes partial path' '
243
git reset --hard
244
'
245
246
+test_expect_success 'mergetool delete/delete conflict' '
247
+ git checkout -b delete-base branch1 &&
248
+ mkdir -p a/a &&
249
+ (echo one; echo two; echo 3; echo 4) >a/a/file.txt &&
250
+ git add a/a/file.txt &&
251
+ git commit -m"base file" &&
252
+ git checkout -b move-to-b delete-base &&
253
+ mkdir -p b/b &&
254
+ git mv a/a/file.txt b/b/file.txt &&
255
+ (echo one; echo two; echo 4) >b/b/file.txt &&
256
+ git commit -a -m"move to b" &&
257
+ git checkout -b move-to-c delete-base &&
258
+ mkdir -p c/c &&
259
+ git mv a/a/file.txt c/c/file.txt &&
260
+ (echo one; echo two; echo 3) >c/c/file.txt &&
261
+ git commit -a -m"move to c" &&
262
+ test_must_fail git merge move-to-b &&
263
+ echo d | git mergetool a/a/file.txt &&
264
+ ! test -f a/a/file.txt &&
265
+ git reset --hard HEAD &&
266
+ test_must_fail git merge move-to-b &&
267
+ echo m | git mergetool a/a/file.txt &&
268
+ test -f b/b/file.txt &&
269
+ git reset --hard HEAD &&
270
+ test_must_fail git merge move-to-b &&
271
+ ! echo a | git mergetool a/a/file.txt &&
272
+ ! test -f a/a/file.txt &&
273
+ git reset --hard HEAD
274
+'
275
+
276
+test_expect_success 'mergetool produces no errors when keepBackup is used' '
277
+ test_config mergetool.keepBackup true &&
278
+ test_must_fail git merge move-to-b &&
279
+ : >expect &&
280
+ echo d | git mergetool a/a/file.txt 2>actual &&
281
+ test_cmp expect actual &&
282
+ git reset --hard HEAD
283
+'
284
+
285
test_expect_success 'deleted vs modified submodule' '
286
git checkout -b test6 branch1 &&
287
git submodule update -N &&