Merge branch 'al/t3200-back-on-a-branch'
Test fix. * al/t3200-back-on-a-branch: t3200: clean side effect of git checkout --orphan
This commit is contained in:
commit
e41500ac19
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user