From: Felipe Contreras <felipe.contreras@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>,
Jonathan Nieder <jrnieder@gmail.com>,
Neil Horman <nhorman@tuxdriver.com>,
Christian Couder <chriscool@tuxfamily.org>,
Ramkumar Ramachandra <artagnon@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: [PATCH 2/5] sequencer: trivial fix
Date: Tue, 28 May 2013 07:54:28 -0500 [thread overview]
Message-ID: <1369745671-22418-3-git-send-email-felipe.contreras@gmail.com> (raw)
In-Reply-To: <1369745671-22418-1-git-send-email-felipe.contreras@gmail.com>
We should free objects before leaving.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---
sequencer.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/sequencer.c b/sequencer.c
index ab6f8a7..7eeae2f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -626,12 +626,15 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts)
rerere(opts->allow_rerere_auto);
} else {
int allow = allow_empty(opts, commit);
- if (allow < 0)
- return allow;
+ if (allow < 0) {
+ res = allow;
+ goto leave;
+ }
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-28 12:56 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-28 12:54 [PATCH 0/5] Trivial patches Felipe Contreras
2013-05-28 12:54 ` [PATCH 1/5] remote: trivial style cleanup Felipe Contreras
2013-05-28 17:04 ` Junio C Hamano
2013-05-28 12:54 ` Felipe Contreras [this message]
2013-05-28 12:54 ` [PATCH 3/5] test: trivial cleanups Felipe Contreras
2013-05-28 12:54 ` [PATCH 4/5] test: improve rebase -q test Felipe Contreras
2013-05-28 17:05 ` Junio C Hamano
2013-05-28 17:19 ` Jonathan Nieder
2013-05-28 17:28 ` Junio C Hamano
2013-05-29 2:38 ` Felipe Contreras
2013-05-29 16:52 ` Junio C Hamano
2013-05-29 17:11 ` Felipe Contreras
2013-05-28 12:54 ` [PATCH 5/5] test: rebase: fix --interactive test 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=1369745671-22418-3-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=nhorman@tuxdriver.com \
/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).