summaryrefslogtreecommitdiff
path: root/t/t4150-am.sh
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-15 11:08:11 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-15 19:33:59 (GMT)
commitfcceef4e06f30ea6dc30bd8fe16142472447cb94 (patch)
tree79869aeef529b38d4e6f24041bf0205ca41d4b7d /t/t4150-am.sh
parentab680dce2b565d285ac538fc931bd4b93beb68c8 (diff)
downloadgit-fcceef4e06f30ea6dc30bd8fe16142472447cb94.zip
git-fcceef4e06f30ea6dc30bd8fe16142472447cb94.tar.gz
git-fcceef4e06f30ea6dc30bd8fe16142472447cb94.tar.bz2
t4150: test applying StGit series
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> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4150-am.sh')
-rwxr-xr-xt/t4150-am.sh17
1 files changed, 17 insertions, 0 deletions
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" &&