diff mbox series

[v3,02/11] t6418: tighten delete/normalize conflict testcase

Message ID b35b61007e0184b8579c79bcc55ccf7a3964260a.1597098559.git.gitgitgadget@gmail.com (mailing list archive)
State Accepted
Commit bc29dffe5987d0cff9fd012b5105daa4b1a535bf
Headers show
Series Start preparing merge-related tests to work with multiple merge backends | expand

Commit Message

Derrick Stolee via GitGitGadget Aug. 10, 2020, 10:29 p.m. UTC 
From: Elijah Newren <newren@gmail.com>

The testcase only required that the merge complete without conflict,
without specifying what the correct resolution was.  Since normalization
changed this from a modify/delete to a not-modified/delete, the correct
resolution is to have the file be removed at the end.  Add a check for
this resolution.

Signed-off-by: Elijah Newren <newren@gmail.com>
---
 t/t6418-merge-text-auto.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/t/t6418-merge-text-auto.sh b/t/t6418-merge-text-auto.sh
index 89c86d4e56..30983d18b1 100755
--- a/t/t6418-merge-text-auto.sh
+++ b/t/t6418-merge-text-auto.sh
@@ -197,7 +197,8 @@  test_expect_success 'Test delete/normalize conflict' '
 	git commit -m "remove file" &&
 	git checkout master &&
 	git reset --hard a^ &&
-	git merge side
+	git merge side &&
+	test_path_is_missing file
 '
 
 test_done