From: Jeff King <peff@peff.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>, Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 3/5] branch_get: return early on error
Date: Wed, 8 Jan 2014 04:35:00 -0500 [thread overview]
Message-ID: <20140108093500.GC15720@sigill.intra.peff.net> (raw)
In-Reply-To: <20140108093338.GA15659@sigill.intra.peff.net>
Right now we simply check if "ret" is valid before doing
further processing. As we add more processing, this will
become more and more cumbersome. Instead, let's just check
whether "ret" is invalid and return early with the error.
Signed-off-by: Jeff King <peff@peff.net>
---
remote.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/remote.c b/remote.c
index a89efab..a773004 100644
--- a/remote.c
+++ b/remote.c
@@ -1543,7 +1543,10 @@ struct branch *branch_get(const char *name)
ret = current_branch;
else
ret = make_branch(name, 0);
- if (ret && ret->remote_name) {
+ if (!ret)
+ return NULL;
+
+ if (ret->remote_name) {
ret->remote = remote_get(ret->remote_name);
if (ret->merge_nr) {
int i;
--
1.8.5.2.500.g8060133
next prev parent reply other threads:[~2014-01-08 9:35 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 20:29 [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Ramkumar Ramachandra
2014-01-07 20:30 ` Ramkumar Ramachandra
2014-01-07 20:40 ` Jeff King
2014-01-07 20:48 ` Junio C Hamano
2014-01-07 21:02 ` Ramkumar Ramachandra
2014-01-07 21:16 ` Jeff King
2014-01-07 21:35 ` Ramkumar Ramachandra
2014-01-08 9:33 ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Jeff King
2014-01-08 9:34 ` [PATCH 1/5] sha1_name: refactor upstream_mark Jeff King
2014-01-08 9:34 ` [PATCH 2/5] interpret_branch_name: factor out upstream handling Jeff King
2014-01-08 12:37 ` Ramkumar Ramachandra
2014-01-08 9:35 ` Jeff King [this message]
2014-01-08 9:35 ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08 10:27 ` Jeff King
2014-01-08 10:47 ` [PATCH] t5531: further "matching" fixups Jeff King
2014-01-10 23:34 ` Junio C Hamano
2014-01-11 4:22 ` Jeff King
2014-01-08 11:09 ` [PATCH 4/5] branch_get: provide per-branch pushremote pointers Jeff King
2014-01-08 9:37 ` [PATCH 5/5] implement @{publish} shorthand Jeff King
2014-01-08 23:42 ` Junio C Hamano
2014-01-09 18:20 ` Jeff King
2014-01-09 21:24 ` Junio C Hamano
2014-01-09 8:39 ` Philip Oakley
2014-01-09 22:03 ` Jeff King
2014-01-09 22:24 ` Junio C Hamano
2014-01-24 0:16 ` Junio C Hamano
2014-01-24 21:35 ` Jeff King
2014-01-24 22:05 ` Ramkumar Ramachandra
2014-01-24 23:12 ` Junio C Hamano
2014-02-15 11:50 ` Philip Oakley
2014-02-18 8:52 ` Jeff King
2014-02-18 13:10 ` Johan Herland
2014-02-18 19:52 ` Junio C Hamano
2014-01-08 12:40 ` [RFC/PATCH 0/5] <branch>@{publish} shorthand Ramkumar Ramachandra
2014-01-07 20:36 ` [RFC/PATCH] format-patch: introduce branch.*.forkedFrom Junio C Hamano
2014-01-07 20:40 ` Ramkumar Ramachandra
2014-01-07 20:42 ` Junio C Hamano
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140108093500.GC15720@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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 NNTP newsgroup(s).