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>
This commit is contained in:
parent
1daaddd1d3
commit
ab680dce2b
@ -297,6 +297,7 @@ split_patches () {
|
||||
;;
|
||||
stgit)
|
||||
this=0
|
||||
test 0 -eq "$#" && set -- -
|
||||
for stgit in "$@"
|
||||
do
|
||||
this=$(expr "$this" + 1)
|
||||
@ -318,7 +319,7 @@ split_patches () {
|
||||
print "Subject: ", $_ ;
|
||||
$subject = 1;
|
||||
}
|
||||
' < "$stgit" > "$dotest/$msgnum" || clean_abort
|
||||
' -- "$stgit" >"$dotest/$msgnum" || clean_abort
|
||||
done
|
||||
echo "$this" > "$dotest/last"
|
||||
this=
|
||||
|
@ -209,6 +209,16 @@ test_expect_success 'am applies stgit patch' '
|
||||
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" &&
|
||||
|
Loading…
Reference in New Issue
Block a user