From: Junio C Hamano <gitster@pobox.com>
To: Paul Tan <pyokagan@gmail.com>
Cc: git@vger.kernel.org,
Johannes Schindelin <johannes.schindelin@gmx.de>,
Stefan Beller <sbeller@google.com>
Subject: Re: [PATCH 07/12] t4150: am with applypatch-msg hook
Date: Mon, 06 Jul 2015 10:46:14 -0700 [thread overview]
Message-ID: <xmqqk2ud18nt.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <1435861000-25278-8-git-send-email-pyokagan@gmail.com> (Paul Tan's message of "Fri, 3 Jul 2015 02:16:35 +0800")
Paul Tan <pyokagan@gmail.com> 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@example.com" &&
next prev parent reply other threads:[~2015-07-06 17:46 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 18:16 [PATCH 00/12] Improve git-am test coverage Paul Tan
2015-07-02 18:16 ` [PATCH 01/12] t4150: am.messageid really adds the message id Paul Tan
2015-07-02 18:41 ` Paolo Bonzini
2015-07-06 17:38 ` Junio C Hamano
2015-07-02 18:16 ` [PATCH 02/12] t4150: am fails if index is dirty Paul Tan
2015-07-05 15:38 ` Johannes Schindelin
2015-07-07 6:35 ` Paul Tan
2015-07-02 18:16 ` [PATCH 03/12] t4151: am --abort will keep dirty index intact Paul Tan
2015-07-02 18:16 ` [PATCH 04/12] t4150: am refuses patches when paused Paul Tan
2015-07-02 18:16 ` [PATCH 05/12] t4150: am --resolved fails if index has no changes Paul Tan
2015-07-02 18:16 ` [PATCH 06/12] t4150: am --resolved fails if index has unmerged entries Paul Tan
2015-07-02 18:16 ` [PATCH 07/12] t4150: am with applypatch-msg hook Paul Tan
2015-07-06 17:46 ` Junio C Hamano [this message]
2015-07-02 18:16 ` [PATCH 08/12] t4150: am with pre-applypatch hook Paul Tan
2015-07-02 18:16 ` [PATCH 09/12] t4150: am with post-applypatch hook Paul Tan
2015-07-05 15:58 ` Johannes Schindelin
2015-07-07 6:47 ` Paul Tan
2015-07-07 8:07 ` Johannes Schindelin
2015-07-02 18:16 ` [PATCH 10/12] t4150: tests for am --[no-]scissors Paul Tan
2015-07-02 18:16 ` [PATCH 11/12] t3418: non-interactive rebase --continue with rerere enabled Paul Tan
2015-07-02 18:16 ` [PATCH 12/12] t3901: test git-am encoding conversion Paul Tan
2015-07-08 20:44 ` Johannes Sixt
2015-07-14 9:43 ` Paul Tan
2015-07-03 16:24 ` [PATCH 00/12] Improve git-am test coverage Stefan Beller
2015-07-05 16:02 ` Johannes Schindelin
2015-07-06 20:42 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqk2ud18nt.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=johannes.schindelin@gmx.de \
--cc=pyokagan@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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).