diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2018-06-05 14:40:45 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-11 09:41:01 -0700 |
| commit | e4d2d55ae46216872c9eaa3b9d0072aa8361d5d3 (patch) | |
| tree | 7920ef13ed699d9df1a5e400d473ba37505ab816 /checkout.c | |
| parent | e417151b24bcf1277a48fc6e9a5c184998402428 (diff) | |
| download | git-e4d2d55ae46216872c9eaa3b9d0072aa8361d5d3.tar.gz | |
checkout.c: change "unique" member to "num_matches"
Internally track how many matches we find in the check_tracking_name()
callback. Nothing uses this now, but it will be made use of in a later
change.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'checkout.c')
| -rw-r--r-- | checkout.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/checkout.c b/checkout.c index 80e430cda8..7662a39a62 100644 --- a/checkout.c +++ b/checkout.c @@ -7,10 +7,10 @@ struct tracking_name_data { /* const */ char *src_ref; char *dst_ref; struct object_id *dst_oid; - int unique; + int num_matches; }; -#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 1 } +#define TRACKING_NAME_DATA_INIT { NULL, NULL, NULL, 0 } static int check_tracking_name(struct remote *remote, void *cb_data) { @@ -23,9 +23,9 @@ static int check_tracking_name(struct remote *remote, void *cb_data) free(query.dst); return 0; } + cb->num_matches++; if (cb->dst_ref) { free(query.dst); - cb->unique = 0; return 0; } cb->dst_ref = query.dst; @@ -39,7 +39,7 @@ const char *unique_tracking_name(const char *name, struct object_id *oid) cb_data.dst_oid = oid; for_each_remote(check_tracking_name, &cb_data); free(cb_data.src_ref); - if (cb_data.unique) + if (cb_data.num_matches == 1) return cb_data.dst_ref; free(cb_data.dst_ref); return NULL; |