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>
This commit is contained in:
@ -116,6 +116,13 @@ test_expect_success setup '
|
|||||||
echo "---" &&
|
echo "---" &&
|
||||||
git diff-tree --no-commit-id --stat -p second
|
git diff-tree --no-commit-id --stat -p second
|
||||||
} >patch1-stgit.eml &&
|
} >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 &&
|
sed -n -e "3,\$p" msg >file &&
|
||||||
git add file &&
|
git add file &&
|
||||||
@ -219,6 +226,16 @@ test_expect_success 'am --patch-format=stgit applies stgit patch' '
|
|||||||
test_cmp_rev second^ HEAD^
|
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' '
|
test_expect_success 'setup: new author and committer' '
|
||||||
GIT_AUTHOR_NAME="Another Thor" &&
|
GIT_AUTHOR_NAME="Another Thor" &&
|
||||||
GIT_AUTHOR_EMAIL="a.thor@example.com" &&
|
GIT_AUTHOR_EMAIL="a.thor@example.com" &&
|
||||||
|
Reference in New Issue
Block a user