diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-18 17:58:02 -0700 |
| commit | e41500ac190be71c033aaf57adabeb182c23feed (patch) | |
| tree | 2f3bf76edbc5b2f8699832f17bcd4f2e5463ce51 | |
| parent | 711f5b3ce208071e711c40938eb5a676efa6f82b (diff) | |
| parent | e6d5a11fed0bd6871a16e9004d960f1447529e67 (diff) | |
| download | git-e41500ac190be71c033aaf57adabeb182c23feed.tar.xz | |
Merge branch 'al/t3200-back-on-a-branch'
Test fix.
* al/t3200-back-on-a-branch:
t3200: clean side effect of git checkout --orphan
| -rwxr-xr-x | t/t3200-branch.sh | 1 |
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 |