diff options
| author |  Paul Tan <pyokagan@gmail.com> | 2015-06-15 19:08:13 +0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-06-15 12:34:31 -0700 |
| commit | 9f0aa6e65447c719abe8fe739d9f1e40b7335af8 (patch) | |
| tree | b83ed9799a46914e03b87de83542c47d1bc7c989 /t | |
| parent | am: use gmtime() to parse mercurial patch date (diff) | |
| download | tgif-9f0aa6e65447c719abe8fe739d9f1e40b7335af8.tar.xz | |
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 't')
| -rwxr-xr-x | t/t4150-am.sh | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/t/t4150-am.sh b/t/t4150-am.sh index 4beb4b3894..3ebafd9234 100755 --- a/t/t4150-am.sh +++ b/t/t4150-am.sh @@ -259,6 +259,16 @@ test_expect_success 'am applies hg patch' ' test_cmp_rev second^ HEAD^ ' +test_expect_success 'am --patch-format=hg applies hg patch' ' + rm -fr .git/rebase-apply && + git checkout -f first && + git am --patch-format=hg <patch1-hg.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" && |