Merge branch 'al/t3200-back-on-a-branch'

Test fix.

* al/t3200-back-on-a-branch:
  t3200: clean side effect of git checkout --orphan

diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 4c0734157ba0b88432ec583321bdb2143f0c4461..028c88d1b24efc945fb605360eda51a86f60bd36 100755 (executable)
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -1287,6 +1287,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' '
 '
 
 test_expect_success 'refuse --edit-description on unborn branch for now' '
+       test_when_finished "git checkout master" &&
        write_script editor <<-\EOF &&
                echo "New contents" >"$1"
        EOF