mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote.c: introduce branch_get_upstream helper

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King
2015-05-21 00:45:28 -04:00
committed by Junio C Hamano
parent 8770e6fbb2
commit a9f9f8cc1f
5 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
builtin/for-each-ref.c
View File

@ -664,10 +664,9 @@ static void populate_value(struct refinfo *ref)
continue;
branch = branch_get(ref->refname + 11);
if (!branch || !branch->merge || !branch->merge[0] ||
!branch->merge[0]->dst)
refname = branch_get_upstream(branch);
if (!refname)
continue;
refname = branch->merge[0]->dst;
} else if (starts_with(name, "color:")) {
char color[COLOR_MAXLEN] = "";