commit 56d06fe4aa9089bccb4ff247fc3224fc7431c72d
author Elijah Newren <newren@gmail.com> Mon Sep 27 16:33:46 2021 +0000
committer Junio C Hamano <gitster@pobox.com> Mon Sep 27 13:38:37 2021 -0700
tree 328fc04618ea1dafbe88feb3e05bfd6375ad8aba
parent 1fdd51aa13c27403c37b57ead32ef79b81d8128b

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>

t/t2500-untracked-overwriting.sh

diff --git a/t/t2500-untracked-overwriting.sh b/t/t2500-untracked-overwriting.sh
index 5ec6605..5c0bf4d 100755
--- a/t/t2500-untracked-overwriting.sh
+++ b/t/t2500-untracked-overwriting.sh
@@ -218,7 +218,7 @@
 	)
 '
 
-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 &&