From 1fdd51aa13c27403c37b57ead32ef79b81d8128b Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Mon, 27 Sep 2021 16:33:45 +0000 Subject: unpack-trees: avoid nuking untracked dir in way of unmerged file Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- t/t2500-untracked-overwriting.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 't/t2500-untracked-overwriting.sh') 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 && -- cgit v1.2.3