From: Junio C Hamano <gitster@pobox•com>
To: Jeff King <peff@peff•net>
Cc: git@vger•kernel.org, Eric Sunshine <sunshine@sunshineco•com>
Subject: Re: [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper
Date: Thu, 21 May 2015 11:07:33 -0700 [thread overview]
Message-ID: <xmqqbnhdkdne.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150521044528.GG23409@peff.net> (Jeff King's message of "Thu, 21 May 2015 00:45:28 -0400")
Jeff King <peff@peff•net> writes:
> All of the information needed to find the @{upstream} of a
> branch is included in the branch struct, but callers have to
> navigate a series of possible-NULL values to get there.
> Let's wrap that logic up in an easy-to-read helper.
>
> Signed-off-by: Jeff King <peff@peff•net>
This step in the whole series is a gem. I cannot believe that we
were content having to repeat that "branch->merge[0]->dst if we can
dereference down to that level" this many times. Nice clean-up.
> diff --git a/builtin/branch.c b/builtin/branch.c
> index 258fe2f..1eb6215 100644
> --- a/builtin/branch.c
> +++ b/builtin/branch.c
> @@ -123,14 +123,12 @@ static int branch_merged(int kind, const char *name,
>
> if (kind == REF_LOCAL_BRANCH) {
> struct branch *branch = branch_get(name);
> + const char *upstream = branch_get_upstream(branch);
> unsigned char sha1[20];
>
> - if (branch &&
> - branch->merge &&
> - branch->merge[0] &&
> - branch->merge[0]->dst &&
> + if (upstream &&
> (reference_name = reference_name_to_free =
> - resolve_refdup(branch->merge[0]->dst, RESOLVE_REF_READING,
> + resolve_refdup(upstream, RESOLVE_REF_READING,
> sha1, NULL)) != NULL)
> reference_rev = lookup_commit_reference(sha1);
next prev parent reply other threads:[~2015-05-21 18:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-21 4:44 [PATCH v3 0/14] implement @{push} shorthand Jeff King
2015-05-21 4:45 ` [PATCH v3 01/14] remote.c: drop default_remote_name variable Jeff King
2015-05-21 4:45 ` [PATCH v3 02/14] remote.c: refactor setup of branch->merge list Jeff King
2015-05-21 17:47 ` Junio C Hamano
2015-05-21 4:45 ` [PATCH v3 03/14] remote.c: drop "remote" pointer from "struct branch" Jeff King
2015-05-21 4:45 ` [PATCH v3 04/14] remote.c: hoist branch.*.remote lookup out of remote_get_1 Jeff King
2015-05-21 4:45 ` [PATCH v3 05/14] remote.c: provide per-branch pushremote name Jeff King
2015-05-21 4:45 ` [PATCH v3 06/14] remote.c: hoist read_config into remote_get_1 Jeff King
2015-05-21 4:45 ` [PATCH v3 07/14] remote.c: introduce branch_get_upstream helper Jeff King
2015-05-21 18:07 ` Junio C Hamano [this message]
2015-05-21 18:14 ` Jeff King
2015-05-21 18:35 ` Jeff King
2015-05-21 19:16 ` Junio C Hamano
2015-05-21 4:45 ` [PATCH v3 08/14] remote.c: report specific errors from branch_get_upstream Jeff King
2015-05-21 18:33 ` Junio C Hamano
2015-05-21 18:49 ` Jeff King
2015-05-21 19:25 ` Junio C Hamano
2015-05-22 0:46 ` Jeff King
2015-05-22 0:49 ` Jeff King
2015-05-21 4:45 ` [PATCH v3 09/14] remote.c: add branch_get_push Jeff King
2015-05-21 4:45 ` [PATCH v3 10/14] sha1_name: refactor upstream_mark Jeff King
2015-05-21 4:45 ` [PATCH v3 11/14] sha1_name: refactor interpret_upstream_mark Jeff King
2015-05-21 4:45 ` [PATCH v3 12/14] sha1_name: implement @{push} shorthand Jeff King
2015-05-21 4:45 ` [PATCH v3 13/14] for-each-ref: use skip_prefix instead of starts_with Jeff King
2015-05-21 4:45 ` [PATCH v3 14/14] for-each-ref: accept "%(push)" format Jeff King
2015-05-21 4:52 ` [PATCH v3 0/14] implement @{push} shorthand Jeff King
2015-05-21 18:37 ` 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=xmqqbnhdkdne.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=peff@peff$(echo .)net \
--cc=sunshine@sunshineco$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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