sequencer: remove useless indentation
By using good ol' goto. Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
edca415256
commit
c8d1351deb
16
sequencer.c
16
sequencer.c
@ -474,7 +474,7 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
|
||||
struct commit_message msg = { NULL, NULL, NULL, NULL, NULL };
|
||||
char *defmsg = NULL;
|
||||
struct strbuf msgbuf = STRBUF_INIT;
|
||||
int res, unborn = 0;
|
||||
int res, unborn = 0, allow;
|
||||
|
||||
if (opts->no_commit) {
|
||||
/*
|
||||
@ -624,14 +624,16 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
|
||||
msg.subject);
|
||||
print_advice(res == 1, opts);
|
||||
rerere(opts->allow_rerere_auto);
|
||||
} else {
|
||||
int allow = allow_empty(opts, commit);
|
||||
if (allow < 0)
|
||||
return allow;
|
||||
if (!opts->no_commit)
|
||||
res = run_git_commit(defmsg, opts, allow);
|
||||
goto leave;
|
||||
}
|
||||
|
||||
allow = allow_empty(opts, commit);
|
||||
if (allow < 0)
|
||||
return allow;
|
||||
if (!opts->no_commit)
|
||||
res = run_git_commit(defmsg, opts, allow);
|
||||
|
||||
leave:
|
||||
free_message(&msg);
|
||||
free(defmsg);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user