зеркало из https://github.com/microsoft/git.git
t4150: am with pre-applypatch hook
Since d1c5f2a
(Add git-am, applymbox replacement., 2005-10-07),
git-am.sg will invoke the pre-applypatch hook after applying the patch
to the index, but before a commit is made. Should the hook exit with a
non-zero status, git am will exit.
Add tests for this hook.
Helped-by: Junio C Hamano <gitster@pobox.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
f26bdf2d98
Коммит
3bc6686b86
|
@ -234,6 +234,39 @@ test_expect_success 'am with failing applypatch-msg hook' '
|
||||||
test_cmp_rev first HEAD
|
test_cmp_rev first HEAD
|
||||||
'
|
'
|
||||||
|
|
||||||
|
test_expect_success 'am with pre-applypatch hook' '
|
||||||
|
test_when_finished "rm -f .git/hooks/pre-applypatch" &&
|
||||||
|
rm -fr .git/rebase-apply &&
|
||||||
|
git reset --hard &&
|
||||||
|
git checkout first &&
|
||||||
|
mkdir -p .git/hooks &&
|
||||||
|
write_script .git/hooks/pre-applypatch <<-\EOF &&
|
||||||
|
git diff first >diff.actual
|
||||||
|
exit 0
|
||||||
|
EOF
|
||||||
|
git am patch1 &&
|
||||||
|
test_path_is_missing .git/rebase-apply &&
|
||||||
|
git diff --exit-code second &&
|
||||||
|
test_cmp_rev second HEAD &&
|
||||||
|
git diff first..second >diff.expected &&
|
||||||
|
test_cmp diff.expected diff.actual
|
||||||
|
'
|
||||||
|
|
||||||
|
test_expect_success 'am with failing pre-applypatch hook' '
|
||||||
|
test_when_finished "rm -f .git/hooks/pre-applypatch" &&
|
||||||
|
rm -fr .git/rebase-apply &&
|
||||||
|
git reset --hard &&
|
||||||
|
git checkout first &&
|
||||||
|
mkdir -p .git/hooks &&
|
||||||
|
write_script .git/hooks/pre-applypatch <<-\EOF &&
|
||||||
|
exit 1
|
||||||
|
EOF
|
||||||
|
test_must_fail git am patch1 &&
|
||||||
|
test_path_is_dir .git/rebase-apply &&
|
||||||
|
git diff --exit-code second &&
|
||||||
|
test_cmp_rev first 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" &&
|
||||||
|
|
Загрузка…
Ссылка в новой задаче