diff options
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7201-co.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t7201-co.sh b/t/t7201-co.sh index 72b9b375ba..f165582019 100755 --- a/t/t7201-co.sh +++ b/t/t7201-co.sh @@ -223,6 +223,9 @@ test_expect_success 'switch to another branch while carrying a deletion' ' test_must_fail git checkout simple 2>errs && test_i18ngrep overwritten errs && + test_must_fail git read-tree --quiet -m -u HEAD simple 2>errs && + test_must_be_empty errs && + git checkout --merge simple 2>errs && test_i18ngrep ! overwritten errs && git ls-files -u && |