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

7
builtin/log.c
View File

@ -1632,16 +1632,13 @@ int cmd_cherry(int argc, const char **argv, const char *prefix)
break;
default:
current_branch = branch_get(NULL);
if (!current_branch || !current_branch->merge
|| !current_branch->merge[0]
|| !current_branch->merge[0]->dst) {
upstream = branch_get_upstream(current_branch);
if (!upstream) {
fprintf(stderr, _("Could not find a tracked"
" remote branch, please"
" specify <upstream> manually.\n"));
usage_with_options(cherry_usage, options);
}
upstream = current_branch->merge[0]->dst;
}
init_revisions(&revs, prefix);