From: Paul Tan <pyokagan@gmail.com>
To: git@vger.kernel.org
Cc: Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>,
Chris Packham <judge.packham@gmail.com>,
Paul Tan <pyokagan@gmail.com>
Subject: [PATCH 3/5] t4150: test applying StGit series
Date: Mon, 8 Jun 2015 23:48:49 +0800 [thread overview]
Message-ID: <1433778531-18260-4-git-send-email-pyokagan@gmail.com> (raw)
In-Reply-To: <1433778531-18260-1-git-send-email-pyokagan@gmail.com>
A StGit series is a directory containing a "series" file which begins
with the line:
# This series applies on GIT commit XXXXX
where XXXXX is the commit ID that the patch series applies on. Every
following line names a patch in the directory to be applied.
Test that git-am, when given this "series" file, is able to detect it as
an StGit series and apply all the patches in the series.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
---
t/t4150-am.sh | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 51962e4..7aad8f8 100755
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -116,6 +116,13 @@ test_expect_success setup '
echo "---" &&
git diff-tree --no-commit-id --stat -p second
} >patch1-stgit.eml &&
+ mkdir stgit-series &&
+ cp patch1-stgit.eml stgit-series/patch &&
+ {
+ echo "# This series applies on GIT commit $(git rev-parse first)" &&
+ echo "patch"
+ } >stgit-series/series &&
+
sed -n -e "3,\$p" msg >file &&
git add file &&
@@ -219,6 +226,16 @@ test_expect_success 'am --patch-format=stgit applies stgit patch' '
test_cmp_rev second^ HEAD^
'
+test_expect_success 'am applies stgit series' '
+ rm -fr .git/rebase-apply &&
+ git checkout -f first &&
+ git am stgit-series/series &&
+ 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" &&
--
2.1.4
next prev parent reply other threads:[~2015-06-08 15:50 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-08 15:48 [PATCH 0/5] am: improve test coverage and touch up foreign patch parsing Paul Tan
2015-06-08 15:48 ` [PATCH 1/5] t4150: test applying StGit patch Paul Tan
2015-06-08 15:48 ` [PATCH 2/5] am: teach StGit patch parser how to read from stdin Paul Tan
2015-06-08 19:57 ` Junio C Hamano
2015-06-09 9:38 ` Paul Tan
2015-06-08 15:48 ` Paul Tan [this message]
2015-06-08 15:48 ` [PATCH 4/5] am: use gmtime() to parse mercurial patch date Paul Tan
2015-06-08 15:48 ` [PATCH 5/5] am: teach mercurial patch parser how to read from stdin Paul Tan
2015-06-08 17:13 ` Stefan Beller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1433778531-18260-4-git-send-email-pyokagan@gmail.com \
--to=pyokagan@gmail.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=judge.packham@gmail.com \
--cc=sbeller@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).