checkout -m path: fix recreating conflicts

diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index 1c857cf4ab6e359d7009d2c6b5018bb61c916e93..cb3d1837709fbce30fc508e339ce671c55eb9a1b 100755 (executable)
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-test_description='git-send-email'
+test_description='git send-email'
 . ./test-lib.sh
 
 PROG='git send-email'
@@ -109,7 +109,7 @@ test_expect_success 'allow long lines with --no-validate' '
                --from="Example <nobody@example.com>" \
                --to=nobody@example.com \
                --smtp-server="$(pwd)/fake.sendmail" \
-               --no-validate \
+               --novalidate \
                $patches longline.patch \
                2>errors
 '
@@ -292,4 +292,25 @@ test_expect_success '--compose adds MIME for utf8 subject' '
        grep "^Subject: =?utf-8?q?utf8-s=C3=BCbj=C3=ABct?=" msgtxt1
 '
 
+test_expect_success 'detects ambiguous reference/file conflict' '
+       echo master > master &&
+       git add master &&
+       git commit -m"add master" &&
+       test_must_fail git send-email --dry-run master 2>errors &&
+       grep disambiguate errors
+'
+
+test_expect_success 'feed two files' '
+       rm -fr outdir &&
+       git format-patch -2 -o outdir &&
+       GIT_SEND_EMAIL_NOTTY=1 git send-email \
+       --dry-run \
+       --from="Example <nobody@example.com>" \
+       --to=nobody@example.com \
+       outdir/000?-*.patch 2>errors >out &&
+       grep "^Subject: " out >subjects &&
+       test "z$(sed -n -e 1p subjects)" = "zSubject: [PATCH 1/2] Second." &&
+       test "z$(sed -n -e 2p subjects)" = "zSubject: [PATCH 2/2] add master"
+'
+
 test_done