Paul Tan <pyokagan@xxxxxxxxx> writes: > +test_expect_success 'am with applypatch-msg hook' ' > + test_when_finished "rm -f .git/hooks/applypatch-msg" && > + rm -fr .git/rebase-apply && > + git reset --hard && > + git checkout first && > + mkdir -p .git/hooks && > + cat >.git/hooks/applypatch-msg <<-\EOF && > + #!/bin/sh > + cat "$1" >actual-msg && > + echo hook-message >"$1" > + EOF > + chmod +x .git/hooks/applypatch-msg && This (and the other one below) looks like a good candidate for the write_script helper. > + git am patch1 && > + test_path_is_missing .git/rebase-apply && > + git diff --exit-code second && > + echo hook-message >expected && > + git log -1 --format=format:%B >actual && > + test_cmp expected actual && > + git log -1 --format=format:%B second >expected && > + test_cmp expected actual-msg > +' > + > +test_expect_success 'am with failing applypatch-msg hook' ' > + test_when_finished "rm -f .git/hooks/applypatch-msg" && > + rm -fr .git/rebase-apply && > + git reset --hard && > + git checkout first && > + mkdir -p .git/hooks && > + cat >.git/hooks/applypatch-msg <<-\EOF && > + #!/bin/sh > + exit 1 > + EOF > + chmod +x .git/hooks/applypatch-msg && > + test_must_fail git am patch1 && > + test_path_is_dir .git/rebase-apply && > + git diff --exit-code first && > + test_cmp_rev first HEAD > +' > + > test_expect_success 'setup: new author and committer' ' > GIT_AUTHOR_NAME="Another Thor" && > GIT_AUTHOR_EMAIL="a.thor@xxxxxxxxxxx" && -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html