summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-15 11:08:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-15 19:33:24 (GMT)
commitab680dce2b565d285ac538fc931bd4b93beb68c8 (patch)
tree40c2497581b8e4c0c2e234e79d2eb07099d699fc /git-am.sh
parent1daaddd1d3fc92e1766fb5d9701db0418c6813bc (diff)
downloadgit-ab680dce2b565d285ac538fc931bd4b93beb68c8.zip
git-ab680dce2b565d285ac538fc931bd4b93beb68c8.tar.gz
git-ab680dce2b565d285ac538fc931bd4b93beb68c8.tar.bz2
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index a67d0f9..1f4c09e 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -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=