diff options
author | Jeff King <peff@peff.net> | 2015-05-21 20:49:11 -0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-05-22 09:32:34 -0700 |
commit | 979cb245e29b35812d2d71a04069ba7a4580981f (patch) | |
tree | 52ae37718da691696524e25cc7286e3d929a9571 /sha1_name.c | |
parent | remote.c: untangle error logic in branch_get_upstream (diff) | |
download | tgif-979cb245e29b35812d2d71a04069ba7a4580981f.tar.xz |
remote.c: return upstream name from stat_tracking_info
After calling stat_tracking_info, callers often want to
print the name of the upstream branch (in addition to the
tracking count). To do this, they have to access
branch->merge->dst[0] themselves. This is not wrong, as the
return value from stat_tracking_info tells us whether we
have an upstream branch or not. But it is a bit leaky, as we
make an assumption about how it calculated the upstream
name.
Instead, let's add an out-parameter that lets the caller
know the upstream name we found.
As a bonus, we can get rid of the unusual tri-state return
from the function. We no longer need to use it to
differentiate between "no tracking config" and "tracking ref
does not exist" (since you can check the upstream_name for
that), so we can just use the usual 0/-1 convention for
success/error.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1_name.c')
0 files changed, 0 insertions, 0 deletions