am: teach StGit patch parser how to read from stdin

git-mailsplit, which splits mbox patches, will read the patch from stdin
when the filename is "-" or there are no files listed on the
command-line.

To be consistent with this behavior, teach the StGit patch parser to
read from stdin if the filename is "-" or no files are listed on the
command-line.

Based-on-patch-by: Chris Packham <judge.packham@gmail.com>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-am.sh b/git-am.sh
index a67d0f98989706fa69df4cf7d6242ad9531eb337..1f4c09e3d434646ebd3b53d1a151a1fb916dffa9 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -297,6 +297,7 @@ split_patches () {
                ;;
        stgit)
                this=0
                ;;
        stgit)
                this=0

+               test 0 -eq "$#" && set -- -

                for stgit in "$@"
                do
                        this=$(expr "$this" + 1)
                for stgit in "$@"
                do
                        this=$(expr "$this" + 1)


@@ -318,7 +319,7 @@ split_patches () {
                                        print "Subject: ", $_ ;
                                        $subject = 1;
                                }
                                        print "Subject: ", $_ ;
                                        $subject = 1;
                                }

-                       ' < "$stgit" > "$dotest/$msgnum" || clean_abort
+                       ' -- "$stgit" >"$dotest/$msgnum" || clean_abort

                done
                echo "$this" > "$dotest/last"
                this=
                done
                echo "$this" > "$dotest/last"
                this=

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 0ead529a2f3f57d028ae7944798296f3fb1459ef..51962e481ea69e476776a15d7a651ed25ade5f01 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -209,6 +209,16 @@ test_expect_success 'am applies stgit patch' '
        test_cmp_rev second^ HEAD^
 '
 
        test_cmp_rev second^ HEAD^
 '
 

+test_expect_success 'am --patch-format=stgit applies stgit patch' '
+       rm -fr .git/rebase-apply &&
+       git checkout -f first &&
+       git am --patch-format=stgit <patch1-stgit.eml &&
+       test_path_is_missing .git/rebase-apply &&
+       git diff --exit-code second &&
+       test_cmp_rev second HEAD &&
+       test_cmp_rev second^ HEAD^
+'
+

 test_expect_success 'setup: new author and committer' '
        GIT_AUTHOR_NAME="Another Thor" &&
        GIT_AUTHOR_EMAIL="a.thor@example.com" &&
 test_expect_success 'setup: new author and committer' '
        GIT_AUTHOR_NAME="Another Thor" &&
        GIT_AUTHOR_EMAIL="a.thor@example.com" &&