apply: register conflicted stages to the index

diff --git a/t/t4022-diff-rewrite.sh b/t/t4022-diff-rewrite.sh
index 2a537a21e8e6793e6ffa2fe1522e30f877b209fe..c00a94b9ba4498e72a31856aac9cf653bbce8ba3 100755 (executable)
--- a/t/t4022-diff-rewrite.sh
+++ b/t/t4022-diff-rewrite.sh
@@ -11,7 +11,9 @@ test_expect_success setup '
        tr \
          "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ" \
          "nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM" \
-         <"$TEST_DIRECTORY"/../COPYING >test
+         <"$TEST_DIRECTORY"/../COPYING >test &&
+       echo "to be deleted" >test2 &&
+       git add test2
 
 '
 
@@ -25,5 +27,44 @@ test_expect_success 'detect rewrite' '
 
 '
 
+cat >expect <<EOF
+diff --git a/test2 b/test2
+deleted file mode 100644
+index 4202011..0000000
+--- a/test2
++++ /dev/null
+@@ -1 +0,0 @@
+-to be deleted
+EOF
+test_expect_success 'show deletion diff without -D' '
+
+       rm test2 &&
+       git diff -- test2 >actual &&
+       test_cmp expect actual
+'
+
+cat >expect <<EOF
+diff --git a/test2 b/test2
+deleted file mode 100644
+index 4202011..0000000
+EOF
+test_expect_success 'suppress deletion diff with -D' '
+
+       git diff -D -- test2 >actual &&
+       test_cmp expect actual
+'
+
+test_expect_success 'show deletion diff with -B' '
+
+       git diff -B -- test >actual &&
+       grep "Linus Torvalds" actual
+'
+
+test_expect_success 'suppress deletion diff with -B -D' '
+
+       git diff -B -D -- test >actual &&
+       grep -v "Linus Torvalds" actual
+'
+
 test_done