builtin rebase: handle the pre-rebase hook and --no-verify

This commit converts the equivalent part of the shell script
`git-legacy-rebase.sh` to run the pre-rebase hook (unless disabled), and
to interrupt the rebase with error if the hook fails.

Signed-off-by: Pratik Karki <predatoramigo@gmail.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/rebase.c b/builtin/rebase.c
index 38c496dd10baeab8545a4c2a5475d89aec512546..b79f9b0a9fe4e78151dc17a5a4fc80412903f7ab 100644 (file)
--- a/builtin/rebase.c
+++ b/builtin/rebase.c
@@ -70,6 +70,7 @@ struct rebase_options {
        const char *state_dir;
        struct commit *upstream;
        const char *upstream_name;
        const char *state_dir;
        struct commit *upstream;
        const char *upstream_name;

+       const char *upstream_arg;

        char *head_name;
        struct object_id orig_head;
        struct commit *onto;
        char *head_name;
        struct object_id orig_head;
        struct commit *onto;


@@ -310,6 +311,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
        };
        const char *branch_name;
        int ret, flags;
        };
        const char *branch_name;
        int ret, flags;

+       int ok_to_skip_pre_rebase = 0;

        struct strbuf msg = STRBUF_INIT;
        struct strbuf revisions = STRBUF_INIT;
        struct object_id merge_base;
        struct strbuf msg = STRBUF_INIT;
        struct strbuf revisions = STRBUF_INIT;
        struct object_id merge_base;


@@ -317,6 +319,8 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                OPT_STRING(0, "onto", &options.onto_name,
                           N_("revision"),
                           N_("rebase onto given branch instead of upstream")),
                OPT_STRING(0, "onto", &options.onto_name,
                           N_("revision"),
                           N_("rebase onto given branch instead of upstream")),

+               OPT_BOOL(0, "no-verify", &ok_to_skip_pre_rebase,
+                        N_("allow pre-rebase hook to run")),

                OPT_END(),
        };
 
                OPT_END(),
        };
 


@@ -382,6 +386,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                options.upstream = peel_committish(options.upstream_name);
                if (!options.upstream)
                        die(_("invalid upstream '%s'"), options.upstream_name);
                options.upstream = peel_committish(options.upstream_name);
                if (!options.upstream)
                        die(_("invalid upstream '%s'"), options.upstream_name);

+               options.upstream_arg = options.upstream_name;

        } else
                die("TODO: upstream for --root");
 
        } else
                die("TODO: upstream for --root");
 


@@ -430,6 +435,12 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
                        die(_("Could not resolve HEAD to a revision"));
        }
 
                        die(_("Could not resolve HEAD to a revision"));
        }
 

+       /* If a hook exists, give it a chance to interrupt*/
+       if (!ok_to_skip_pre_rebase &&
+           run_hook_le(NULL, "pre-rebase", options.upstream_arg,
+                       argc ? argv[0] : NULL, NULL))
+               die(_("The pre-rebase hook refused to rebase."));
+

        strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);
        if (reset_head(&options.onto->object.oid, "checkout", NULL, 1))
                die(_("Could not detach HEAD"));
        strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);
        if (reset_head(&options.onto->object.oid, "checkout", NULL, 1))
                die(_("Could not detach HEAD"));