checkout: pass the "num_matches" up to callers

diff --git a/checkout.c b/checkout.c
index 7662a39a6203fec511b0034fbe88a2d374f7bbf7..ee3a7e9c052ab5936d99e739fd18b0ede4799454 100644 (file)
--- a/checkout.c
+++ b/checkout.c
@@ -32,12 +32,15 @@ static int check_tracking_name(struct remote *remote, void *cb_data)
        return 0;
 }
 
-const char *unique_tracking_name(const char *name, struct object_id *oid)
+const char *unique_tracking_name(const char *name, struct object_id *oid,
+                                int *dwim_remotes_matched)
 {
        struct tracking_name_data cb_data = TRACKING_NAME_DATA_INIT;
        cb_data.src_ref = xstrfmt("refs/heads/%s", name);
        cb_data.dst_oid = oid;
        for_each_remote(check_tracking_name, &cb_data);
+       if (dwim_remotes_matched)
+               *dwim_remotes_matched = cb_data.num_matches;
        free(cb_data.src_ref);
        if (cb_data.num_matches == 1)
                return cb_data.dst_ref;