checkout --conflict=<style>: recreate merge in a non-default style

diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index 1d4ff6e8d30ce49a2792107be1c23a66b1df3a8b..ac49311cf2c845475eed00ce5b7d8f364770d1c4 100755 (executable)
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -337,7 +337,7 @@ test_expect_success \
     test refs/heads/delete-me = "$(git symbolic-ref HEAD)" &&
     test_must_fail git checkout --track -b track'
 
-test_expect_success 'checkout an unmerged path should fail' '
+setup_conflicting_index () {
        rm -f .git/index &&
        O=$(echo original | git hash-object -w --stdin) &&
        A=$(echo ourside | git hash-object -w --stdin) &&
@@ -348,7 +348,11 @@ test_expect_success 'checkout an unmerged path should fail' '
                echo "100644 $A 2       file" &&
                echo "100644 $B 3       file" &&
                echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       ) | git update-index --index-info
+}
+
+test_expect_success 'checkout an unmerged path should fail' '
+       setup_conflicting_index &&
        echo "none of the above" >sample &&
        cat sample >fild &&
        cat sample >file &&
@@ -360,17 +364,7 @@ test_expect_success 'checkout an unmerged path should fail' '
 '
 
 test_expect_success 'checkout with an unmerged path can be ignored' '
-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
@@ -383,17 +377,7 @@ test_expect_success 'checkout with an unmerged path can be ignored' '
 '
 
 test_expect_success 'checkout unmerged stage' '
-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
@@ -408,17 +392,7 @@ test_expect_success 'checkout unmerged stage' '
 '
 
 test_expect_success 'checkout with --merge' '
-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
@@ -439,17 +413,7 @@ test_expect_success 'checkout with --merge' '
 
 test_expect_success 'checkout with --merge, in diff3 -m style' '
        git config merge.conflictstyle diff3 &&
-       rm -f .git/index &&
-       O=$(echo original | git hash-object -w --stdin) &&
-       A=$(echo ourside | git hash-object -w --stdin) &&
-       B=$(echo theirside | git hash-object -w --stdin) &&
-       (
-               echo "100644 $A 0       fild" &&
-               echo "100644 $O 1       file" &&
-               echo "100644 $A 2       file" &&
-               echo "100644 $B 3       file" &&
-               echo "100644 $A 0       filf"
-       ) | git update-index --index-info &&
+       setup_conflicting_index &&
        echo "none of the above" >sample &&
        echo ourside >expect &&
        cat sample >fild &&
@@ -470,4 +434,48 @@ test_expect_success 'checkout with --merge, in diff3 -m style' '
        test_cmp merged file
 '
 
+test_expect_success 'checkout --conflict=merge, overriding config' '
+       git config merge.conflictstyle diff3 &&
+       setup_conflicting_index &&
+       echo "none of the above" >sample &&
+       echo ourside >expect &&
+       cat sample >fild &&
+       cat sample >file &&
+       cat sample >filf &&
+       git checkout --conflict=merge -- fild file filf &&
+       (
+               echo "<<<<<<< ours"
+               echo ourside
+               echo "======="
+               echo theirside
+               echo ">>>>>>> theirs"
+       ) >merged &&
+       test_cmp expect fild &&
+       test_cmp expect filf &&
+       test_cmp merged file
+'
+
+test_expect_success 'checkout --conflict=diff3' '
+       git config --unset merge.conflictstyle
+       setup_conflicting_index &&
+       echo "none of the above" >sample &&
+       echo ourside >expect &&
+       cat sample >fild &&
+       cat sample >file &&
+       cat sample >filf &&
+       git checkout --conflict=diff3 -- fild file filf &&
+       (
+               echo "<<<<<<< ours"
+               echo ourside
+               echo "|||||||"
+               echo original
+               echo "======="
+               echo theirside
+               echo ">>>>>>> theirs"
+       ) >merged &&
+       test_cmp expect fild &&
+       test_cmp expect filf &&
+       test_cmp merged file
+'
+
 test_done