diff options
| author | Jeff King <peff@peff.net> | 2015-05-21 00:45:28 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-21 11:04:42 -0700 |
| commit | a9f9f8cc1f59104257eb1a11a2d048f54dd92ee6 (patch) | |
| tree | 2d9d48360152e6090d6c6ebf7591017cb7709083 /builtin/log.c | |
| parent | 8770e6fbb28dffdf9e00d05365120e438d3d236f (diff) | |
| download | git-a9f9f8cc1f59104257eb1a11a2d048f54dd92ee6.tar.gz | |
remote.c: introduce branch_get_upstream helper
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>
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/builtin/log.c b/builtin/log.c index dd8f3fcfc4..fb61c08ee5 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -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); |