summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-15 11:08:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-15 19:34:31 (GMT)
commit9f0aa6e65447c719abe8fe739d9f1e40b7335af8 (patch)
treeb83ed9799a46914e03b87de83542c47d1bc7c989 /git-am.sh
parente9dfe253fd489ea171e0478147aeb6eab91dab75 (diff)
downloadgit-9f0aa6e65447c719abe8fe739d9f1e40b7335af8.zip
git-9f0aa6e65447c719abe8fe739d9f1e40b7335af8.tar.gz
git-9f0aa6e65447c719abe8fe739d9f1e40b7335af8.tar.bz2
am: teach mercurial 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 mercurial 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 5eec11d..f35710c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -327,6 +327,7 @@ split_patches () {
;;
hg)
this=0
+ test 0 -eq "$#" && set -- -
for hg in "$@"
do
this=$(( $this + 1 ))
@@ -353,7 +354,7 @@ split_patches () {
print "\n", $_ ;
$subject = 1;
}
- ' <"$hg" >"$dotest/$msgnum" || clean_abort
+ ' -- "$hg" >"$dotest/$msgnum" || clean_abort
done
echo "$this" >"$dotest/last"
this=