From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Christian Couder <chriscool@tuxfamily.org>,
Thomas Rast <trast@inf.ethz.ch>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH v2 1/8] sequencer: remove useless indentation
Date: Tue, 28 May 2013 22:56:21 -0500 [thread overview]
Message-ID: <1369799788-24803-2-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369799788-24803-1-git-send-email-felipe.contreras@gmail.com>
By using good ol' goto.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
sequencer.c | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index ab6f8a7..b4989ba 100644
--- a/sequencer.c
+++ b/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);
--
1.8.3.rc3.312.g47657de
next prev parent reply other threads:[~2013-05-29 3:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-29 3:56 [PATCH v2 0/8] cherry-pick: improvements Felipe Contreras
2013-05-29 3:56 ` Felipe Contreras [this message]
2013-05-29 3:56 ` [PATCH v2 2/8] sequencer: trivial fix Felipe Contreras
2013-05-29 3:56 ` [PATCH v2 3/8] cherry-pick: add --skip-empty option Felipe Contreras
2013-06-03 18:40 ` Junio C Hamano
2013-06-03 19:21 ` Junio C Hamano
2013-06-03 21:10 ` Felipe Contreras
2013-06-03 21:45 ` Junio C Hamano
2013-06-04 17:10 ` Felipe Contreras
2013-06-04 17:35 ` Junio C Hamano
2013-06-04 17:40 ` Felipe Contreras
2013-06-04 18:30 ` Junio C Hamano
2013-06-05 14:52 ` Felipe Contreras
2013-06-05 18:13 ` Junio C Hamano
2013-06-06 5:01 ` Felipe Contreras
2013-06-04 6:31 ` Antoine Pelisse
2013-05-29 3:56 ` [PATCH v2 4/8] cherry-pick: store rewritten commits Felipe Contreras
2013-06-03 18:49 ` Junio C Hamano
2013-06-03 20:55 ` Felipe Contreras
2013-05-29 3:56 ` [PATCH v2 5/8] sequencer: run post-rewrite hook Felipe Contreras
2013-06-03 18:57 ` Junio C Hamano
2013-06-03 21:01 ` Felipe Contreras
2013-06-04 9:03 ` Thomas Rast
2013-05-29 3:56 ` [PATCH v2 6/8] cherry-pick: add support to copy notes Felipe Contreras
2013-05-29 3:56 ` [PATCH v2 7/8] revert/cherry-pick: add --quiet option Felipe Contreras
2013-05-29 12:33 ` Ramkumar Ramachandra
2013-05-29 13:28 ` Felipe Contreras
2013-05-29 13:32 ` Ramkumar Ramachandra
2013-05-29 13:40 ` Felipe Contreras
2013-06-03 18:59 ` Junio C Hamano
2013-05-29 3:56 ` [PATCH v2 8/8] revert/cherry-pick: add --skip option Felipe Contreras
2013-05-29 12:27 ` Ramkumar Ramachandra
2013-05-29 13:27 ` Felipe Contreras
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=1369799788-24803-2-git-send-email-felipe.contreras@gmail.com \
--to=felipe.contreras@gmail.com \
--cc=artagnon@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=trast@inf.ethz.ch \
/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).