Re: [PATCH v5 4/8] checkout.[ch]: change "unique" member to "num_matches"

2018-06-01 Thread Eric Sunshine
On Fri, Jun 1, 2018 at 5:10 PM, Ævar Arnfjörð Bjarmason
 wrote:
> checkout.[ch]: change "unique" member to "num_matches"

checkout.c: change...

> 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 


[PATCH v5 4/8] checkout.[ch]: change "unique" member to "num_matches"

2018-06-01 Thread Ævar Arnfjörð Bjarmason
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 
---
 checkout.c | 8 
 1 file 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, _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;
-- 
2.17.0.290.gded63e768a