diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-27 18:33:46 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 22:38:37 +0200 |
| commit | 56d06fe4aa9089bccb4ff247fc3224fc7431c72d (patch) | |
| tree | 328fc04618ea1dafbe88feb3e05bfd6375ad8aba /t/t2500-untracked-overwriting.sh | |
| parent | unpack-trees: avoid nuking untracked dir in way of unmerged file (diff) | |
| download | git-56d06fe4aa9089bccb4ff247fc3224fc7431c72d.tar.xz git-56d06fe4aa9089bccb4ff247fc3224fc7431c72d.zip | |
unpack-trees: avoid nuking untracked dir in way of locally deleted file
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t2500-untracked-overwriting.sh')
| -rwxr-xr-x | t/t2500-untracked-overwriting.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t2500-untracked-overwriting.sh b/t/t2500-untracked-overwriting.sh index 5ec66058cf..5c0bf4d21f 100755 --- a/t/t2500-untracked-overwriting.sh +++ b/t/t2500-untracked-overwriting.sh @@ -218,7 +218,7 @@ test_expect_success 'git am --abort and untracked dir vs. unmerged file' ' ) ' -test_expect_failure 'git am --skip and untracked dir vs deleted file' ' +test_expect_success 'git am --skip and untracked dir vs deleted file' ' test_setup_sequencing am_skip_and_untracked && ( cd sequencing_am_skip_and_untracked && |