t5520-pull: Add testcases showing spurious conflicts from git pull --rebase

diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 08c9f7989a578d57a3c0f868786fa6b4cc2bf777..8ab3d61f445725ec48b8b4ce28cfbf4a9ce13844 100755 (executable)
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -53,4 +53,12 @@ test_expect_success 'recursive favouring ours' '
        ! grep 1 file
 '
 
+test_expect_success 'pull with -X' '
+       git reset --hard master && git pull -s recursive -Xours . side &&
+       git reset --hard master && git pull -s recursive -X ours . side &&
+       git reset --hard master && git pull -s recursive -Xtheirs . side &&
+       git reset --hard master && git pull -s recursive -X theirs . side &&
+       git reset --hard master && ! git pull -s recursive -X bork . side
+'
+
 test_done