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

gitster · gitster · commit e41500ac190b · 2020-09-18T17:58:02.000-07:00
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -1287,6 +1287,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' '`
`1287`	`1287`	`'`
`1288`	`1288`
`1289`	`1289`	`test_expect_success 'refuse --edit-description on unborn branch for now' '`
	`1290`	`+ test_when_finished "git checkout master" &&`
`1290`	`1291`	`write_script editor <<-\EOF &&`
`1291`	`1292`	`echo "New contents" >"$1"`
`1292`	`1293`	`EOF`