summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Aaron Lipman <alipman88@gmail.com>2020-08-30 18:42:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-09-08 15:44:25 -0700
commite6d5a11fed0bd6871a16e9004d960f1447529e67 (patch)
tree2de55343ab2d37d3684da39675fc198813a6ddce
parentGit 2.28 (diff)
downloadtgif-e6d5a11fed0bd6871a16e9004d960f1447529e67.tar.xz
t3200: clean side effect of git checkout --orphan
The "refuse --edit-description on unborn branch for now" test in t3200 switches to an orphan branch, causing subsequent git commands referencing HEAD to fail. Avoid this side-effect by switching back to master after the test finishes. This has gone undetected, as the next affected test expects failure - but it currently fails for the wrong reason. Verbose output of the next test referencing HEAD, "--merged is incompatible with --no-merged": fatal: malformed object name HEAD Which this commit corrects to: error: option `no-merged' is incompatible with --merged Signed-off-by: Aaron Lipman <alipman88@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t3200-branch.sh1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 4c0734157b..028c88d1b2 100755
--- 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