diff options
| author | Elijah Newren <newren@gmail.com> | 2021-09-27 18:33:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-09-27 22:38:37 +0200 |
| commit | 1fdd51aa13c27403c37b57ead32ef79b81d8128b (patch) | |
| tree | aa2959d443ab6329fb8f0901be3bd2f5848d7b83 /t/t2500-untracked-overwriting.sh | |
| parent | Change unpack_trees' 'reset' flag into an enum (diff) | |
| download | git-1fdd51aa13c27403c37b57ead32ef79b81d8128b.tar.xz git-1fdd51aa13c27403c37b57ead32ef79b81d8128b.zip | |
unpack-trees: avoid nuking untracked dir in way of unmerged 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 18604360df..5ec66058cf 100755 --- a/t/t2500-untracked-overwriting.sh +++ b/t/t2500-untracked-overwriting.sh @@ -197,7 +197,7 @@ test_expect_failure 'git stash and untracked files' ' ) ' -test_expect_failure 'git am --abort and untracked dir vs. unmerged file' ' +test_expect_success 'git am --abort and untracked dir vs. unmerged file' ' test_setup_sequencing am_abort_and_untracked && ( cd sequencing_am_abort_and_untracked && |