From e6d5a11fed0bd6871a16e9004d960f1447529e67 Mon Sep 17 00:00:00 2001 From: Aaron Lipman Date: Sun, 30 Aug 2020 18:42:00 -0400 Subject: 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 Signed-off-by: Junio C Hamano --- t/t3200-branch.sh | 1 + 1 file changed, 1 insertion(+) (limited to 't') 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 -- cgit v1.2.3