diff options
| author | Jeff Hostetler <jeffhost@microsoft.com> | 2018-01-09 18:50:15 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-24 21:48:38 (GMT) |
| commit | d7d1b496aeea5a151c826683ed28c57ef0ac9389 (patch) | |
| tree | 39f8418293a7f36f2d28785e2285d56df026d1b0 /ref-filter.c | |
| parent | 1eaabe34fc6f486367a176207420378f587d3b48 (diff) | |
| download | git-d7d1b496aeea5a151c826683ed28c57ef0ac9389.zip git-d7d1b496aeea5a151c826683ed28c57ef0ac9389.tar.gz git-d7d1b496aeea5a151c826683ed28c57ef0ac9389.tar.bz2 | |
stat_tracking_info: return +1 when branches not equal
Extend stat_tracking_info() to return +1 when branches are not equal and to
take a new "enum ahead_behind_flags" argument to allow skipping the (possibly
expensive) ahead/behind computation.
This will be used in the next commit to allow "git status" to avoid full
ahead/behind calculations for performance reasons.
Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'ref-filter.c')
| -rw-r--r-- | ref-filter.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ref-filter.c b/ref-filter.c index 3f91617..091144e 100644 --- a/ref-filter.c +++ b/ref-filter.c @@ -1249,8 +1249,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, if (atom->u.remote_ref.option == RR_REF) *s = show_ref(&atom->u.remote_ref.refname, refname); else if (atom->u.remote_ref.option == RR_TRACK) { - if (stat_tracking_info(branch, &num_ours, - &num_theirs, NULL)) { + if (stat_tracking_info(branch, &num_ours, &num_theirs, + NULL, AHEAD_BEHIND_FULL) < 0) { *s = xstrdup(msgs.gone); } else if (!num_ours && !num_theirs) *s = ""; @@ -1267,8 +1267,8 @@ static void fill_remote_ref_details(struct used_atom *atom, const char *refname, free((void *)to_free); } } else if (atom->u.remote_ref.option == RR_TRACKSHORT) { - if (stat_tracking_info(branch, &num_ours, - &num_theirs, NULL)) + if (stat_tracking_info(branch, &num_ours, &num_theirs, + NULL, AHEAD_BEHIND_FULL) < 0) return; if (!num_ours && !num_theirs) |