| commit | e41500ac190be71c033aaf57adabeb182c23feed | [log] [tgz] |
|---|---|---|
| author | Junio C Hamano <gitster@pobox.com> | Fri Sep 18 17:58:02 2020 -0700 |
| committer | Junio C Hamano <gitster@pobox.com> | Fri Sep 18 17:58:02 2020 -0700 |
| tree | 2f3bf76edbc5b2f8699832f17bcd4f2e5463ce51 | |
| parent | 711f5b3ce208071e711c40938eb5a676efa6f82b [diff] | |
| parent | e6d5a11fed0bd6871a16e9004d960f1447529e67 [diff] |
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 4c07341..028c88d 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh
@@ -1287,6 +1287,7 @@ ' 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