t7610: always work on a test-specific branch

Create and use a test-specific branch when the test might create a
commit.  This is not always necessary for correctness, but it improves
debuggability by ensuring a commit created by test #N shows up on the
testN branch, not the branch for test #N-1.

Signed-off-by: Richard Hansen <hansenr@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 28b5f847a55142bd0b3a12fc67c7c37440d64a78..87562d8d4d76a01931eb024e702012e038f65fd6 100755 (executable)
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -184,6 +184,7 @@ test_expect_success 'mergetool in subdir' '
 
 test_expect_success 'mergetool on file in parent dir' '
        test_when_finished "git reset --hard" &&
 
 test_expect_success 'mergetool on file in parent dir' '
        test_when_finished "git reset --hard" &&

+       git checkout -b test$test_count &&

        git submodule update -N &&
        (
                cd subdir &&
        git submodule update -N &&
        (
                cd subdir &&


@@ -217,6 +218,7 @@ test_expect_success 'mergetool skips autoresolved' '
 
 test_expect_success 'mergetool merges all from subdir' '
        test_when_finished "git reset --hard" &&
 
 test_expect_success 'mergetool merges all from subdir' '
        test_when_finished "git reset --hard" &&

+       git checkout -b test$test_count &&

        test_config rerere.enabled false &&
        (
                cd subdir &&
        test_config rerere.enabled false &&
        (
                cd subdir &&


@@ -288,7 +290,7 @@ test_expect_success 'mergetool takes partial path' '
 
 test_expect_success 'mergetool delete/delete conflict' '
        test_when_finished "git reset --hard HEAD" &&
 
 test_expect_success 'mergetool delete/delete conflict' '
        test_when_finished "git reset --hard HEAD" &&

-       git checkout move-to-c &&
+       git checkout -b test$test_count move-to-c &&

        test_must_fail git merge move-to-b &&
        echo d | git mergetool a/a/file.txt &&
        ! test -f a/a/file.txt &&
        test_must_fail git merge move-to-b &&
        echo d | git mergetool a/a/file.txt &&
        ! test -f a/a/file.txt &&


@@ -304,6 +306,7 @@ test_expect_success 'mergetool delete/delete conflict' '
 
 test_expect_success 'mergetool produces no errors when keepBackup is used' '
        test_when_finished "git reset --hard HEAD" &&
 
 test_expect_success 'mergetool produces no errors when keepBackup is used' '
        test_when_finished "git reset --hard HEAD" &&

+       git checkout -b test$test_count &&

        test_config mergetool.keepBackup true &&
        test_must_fail git merge move-to-b &&
        : >expect &&
        test_config mergetool.keepBackup true &&
        test_must_fail git merge move-to-b &&
        : >expect &&


@@ -314,6 +317,7 @@ test_expect_success 'mergetool produces no errors when keepBackup is used' '
 
 test_expect_success 'mergetool honors tempfile config for deleted files' '
        test_when_finished "git reset --hard HEAD" &&
 
 test_expect_success 'mergetool honors tempfile config for deleted files' '
        test_when_finished "git reset --hard HEAD" &&

+       git checkout -b test$test_count &&

        test_config mergetool.keepTemporaries false &&
        test_must_fail git merge move-to-b &&
        echo d | git mergetool a/a/file.txt &&
        test_config mergetool.keepTemporaries false &&
        test_must_fail git merge move-to-b &&
        echo d | git mergetool a/a/file.txt &&


@@ -323,6 +327,7 @@ test_expect_success 'mergetool honors tempfile config for deleted files' '
 test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' '
        test_when_finished "git reset --hard HEAD" &&
        test_when_finished "git clean -fdx" &&
 test_expect_success 'mergetool keeps tempfiles when aborting delete/delete' '
        test_when_finished "git reset --hard HEAD" &&
        test_when_finished "git clean -fdx" &&

+       git checkout -b test$test_count &&

        test_config mergetool.keepTemporaries true &&
        test_must_fail git merge move-to-b &&
        ! (echo a; echo n) | git mergetool a/a/file.txt &&
        test_config mergetool.keepTemporaries true &&
        test_must_fail git merge move-to-b &&
        ! (echo a; echo n) | git mergetool a/a/file.txt &&


@@ -641,7 +646,7 @@ test_expect_success MKTEMP 'temporary filenames are used with mergetool.writeToT
 
 test_expect_success 'diff.orderFile configuration is honored' '
        test_when_finished "git reset --hard >/dev/null" &&
 
 test_expect_success 'diff.orderFile configuration is honored' '
        test_when_finished "git reset --hard >/dev/null" &&

-       git checkout order-file-side2 &&
+       git checkout -b test$test_count order-file-side2 &&

        test_config diff.orderFile order-file &&
        test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
        test_config mergetool.myecho.trustExitCode true &&
        test_config diff.orderFile order-file &&
        test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
        test_config mergetool.myecho.trustExitCode true &&


@@ -659,6 +664,7 @@ test_expect_success 'diff.orderFile configuration is honored' '
 '
 test_expect_success 'mergetool -Oorder-file is honored' '
        test_when_finished "git reset --hard >/dev/null 2>&1" &&
 '
 test_expect_success 'mergetool -Oorder-file is honored' '
        test_when_finished "git reset --hard >/dev/null 2>&1" &&

+       git checkout -b test$test_count &&

        test_config diff.orderFile order-file &&
        test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
        test_config mergetool.myecho.trustExitCode true &&
        test_config diff.orderFile order-file &&
        test_config mergetool.myecho.cmd "echo \"\$LOCAL\"" &&
        test_config mergetool.myecho.trustExitCode true &&