From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Daudt Subject: [PATCH v2] cherry-pick: add --no-verify option Date: Wed, 2 Mar 2016 12:58:26 +0100 Message-ID: <1456919906-9747-1-git-send-email-me@ikke.info> References: <1456864846-14185-1-git-send-email-me@ikke.info> Cc: Eric Sunshine , Kevin Daudt To: git@vger.kernel.org X-From: git-owner@vger.kernel.org Wed Mar 02 12:59:01 2016 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1ab5Qh-0000q0-7G for gcvg-git-2@plane.gmane.org; Wed, 02 Mar 2016 12:58:59 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754897AbcCBL6u (ORCPT ); Wed, 2 Mar 2016 06:58:50 -0500 Received: from ikke.info ([178.21.113.177]:44286 "EHLO vps892.directvps.nl" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754677AbcCBL6s (ORCPT ); Wed, 2 Mar 2016 06:58:48 -0500 Received: by vps892.directvps.nl (Postfix, from userid 182) id 185712D800A; Wed, 2 Mar 2016 12:58:46 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on ikke.info X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.1 Received: from io.ikke (unknown [10.8.0.30]) by vps892.directvps.nl (Postfix) with ESMTP id 4B0F92D8007; Wed, 2 Mar 2016 12:58:44 +0100 (CET) X-Mailer: git-send-email 2.7.2 In-Reply-To: <1456864846-14185-1-git-send-email-me@ikke.info> Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: git commit has a --no-verify option to prevent the pre-commit hook from running. When continuing a conflicted cherry-pick, git commit gets executed which also causes the pre-commit hook to be run. Add --no-verify and pass that through to the git commit command. Signed-off-by: Kevin Daudt --- Changes since v1: - Use write_script to create hook - Add option to cherry-pick man page Documentation/git-cherry-pick.txt | 5 +++++ builtin/revert.c | 2 ++ sequencer.c | 21 ++++++++++++++++----- sequencer.h | 1 + t/t3510-cherry-pick-sequence.sh | 14 ++++++++++++++ 5 files changed, 38 insertions(+), 5 deletions(-) diff --git a/Documentation/git-cherry-pick.txt b/Documentation/git-cherry-pick.txt index 6154e57..30bbdbd 100644 --- a/Documentation/git-cherry-pick.txt +++ b/Documentation/git-cherry-pick.txt @@ -148,6 +148,11 @@ effect to your index in a row. Pass the merge strategy-specific option through to the merge strategy. See linkgit:git-merge[1] for details. +--no-verify:: + Pass --no-verify to the commit command when continuing after a + conflicted cherry-pick to disable any pre-commit hooks that + might get run. + SEQUENCER SUBCOMMANDS --------------------- include::sequencer.txt[] diff --git a/builtin/revert.c b/builtin/revert.c index 56a2c36..81d9c85 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -97,6 +97,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_END(), OPT_END(), OPT_END(), + OPT_END(), }; if (opts->action == REPLAY_PICK) { @@ -106,6 +107,7 @@ static void parse_args(int argc, const char **argv, struct replay_opts *opts) OPT_BOOL(0, "allow-empty", &opts->allow_empty, N_("preserve initially empty commits")), OPT_BOOL(0, "allow-empty-message", &opts->allow_empty_message, N_("allow commits with empty messages")), OPT_BOOL(0, "keep-redundant-commits", &opts->keep_redundant_commits, N_("keep redundant, empty commits")), + OPT_BOOL(0, "no-verify", &opts->no_verify, N_("don't run pre-commit hook when continuing cherry-pick")), OPT_END(), }; if (parse_options_concat(options, ARRAY_SIZE(options), cp_extra)) diff --git a/sequencer.c b/sequencer.c index e66f2fe..657a381 100644 --- a/sequencer.c +++ b/sequencer.c @@ -978,14 +978,25 @@ static int pick_commits(struct commit_list *todo_list, struct replay_opts *opts) return 0; } -static int continue_single_pick(void) +static int continue_single_pick(struct replay_opts *opts) { - const char *argv[] = { "commit", NULL }; + struct argv_array array; + int rc; + + argv_array_init(&array); + argv_array_push(&array, "commit"); if (!file_exists(git_path_cherry_pick_head()) && !file_exists(git_path_revert_head())) return error(_("no cherry-pick or revert in progress")); - return run_command_v_opt(argv, RUN_GIT_CMD); + + if (opts->no_verify) + argv_array_push(&array, "--no-verify"); + + rc = run_command_v_opt(array.argv, RUN_GIT_CMD); + argv_array_clear(&array); + + return rc; } static int sequencer_continue(struct replay_opts *opts) @@ -993,14 +1004,14 @@ static int sequencer_continue(struct replay_opts *opts) struct commit_list *todo_list = NULL; if (!file_exists(git_path_todo_file())) - return continue_single_pick(); + return continue_single_pick(opts); read_populate_opts(&opts); read_populate_todo(&todo_list, opts); /* Verify that the conflict has been resolved */ if (file_exists(git_path_cherry_pick_head()) || file_exists(git_path_revert_head())) { - int ret = continue_single_pick(); + int ret = continue_single_pick(opts); if (ret) return ret; } diff --git a/sequencer.h b/sequencer.h index 5ed5cb1..d868a50 100644 --- a/sequencer.h +++ b/sequencer.h @@ -34,6 +34,7 @@ struct replay_opts { int allow_empty; int allow_empty_message; int keep_redundant_commits; + int no_verify; int mainline; diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 7b7a89d..a97ee52 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -340,6 +340,20 @@ test_expect_success '--continue after resolving conflicts and committing' ' test_cmp expect actual ' +test_expect_success '--continue --no-verify does not run pre-commit hook ' ' + pristine_detach initial && + + mkdir -p .git/hooks && + write_script .git/hooks/pre-commit <<-\EOF && + exit 1 + EOF + test_when_finished "rm -r .git/hooks/" && + + test_must_fail git cherry-pick picked && + git add foo && + git cherry-pick --continue --no-verify +' + test_expect_success '--continue asks for help after resolving patch to nil' ' pristine_detach conflicting && test_must_fail git cherry-pick initial..picked && -- 2.7.2