mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Pratik Karki
2018-09-04 14:27:10 -07:00
committed by Junio C Hamano
parent 075bc8527c
commit 06e4775a8c
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/rebase.c
View File

@ -70,6 +70,7 @@ struct rebase_options {
const char *state_dir; const char *state_dir;
struct commit *upstream; struct commit *upstream;
const char *upstream_name; const char *upstream_name;
const char *upstream_arg;
char *head_name; char *head_name;
struct object_id orig_head; struct object_id orig_head;
struct commit *onto; struct commit *onto;
@ -310,6 +311,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
}; };
const char *branch_name; const char *branch_name;
int ret, flags; int ret, flags;
int ok_to_skip_pre_rebase = 0;
struct strbuf msg = STRBUF_INIT; struct strbuf msg = STRBUF_INIT;
struct strbuf revisions = STRBUF_INIT; struct strbuf revisions = STRBUF_INIT;
struct object_id merge_base; 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, OPT_STRING(0, "onto", &options.onto_name,
N_("revision"), N_("revision"),
N_("rebase onto given branch instead of upstream")), 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); options.upstream = peel_committish(options.upstream_name);
if (!options.upstream) if (!options.upstream)
die(_("invalid upstream '%s'"), options.upstream_name); die(_("invalid upstream '%s'"), options.upstream_name);
options.upstream_arg = options.upstream_name;
} else } else
die("TODO: upstream for --root"); 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); strbuf_addf(&msg, "rebase: checkout %s", options.onto_name);
if (reset_head(&options.onto->object.oid, "checkout", NULL, 1)) if (reset_head(&options.onto->object.oid, "checkout", NULL, 1))
die(_("Could not detach HEAD")); die(_("Could not detach HEAD"));