mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

checkout: pass the "num_matches" up to callers

Browse Source 
Pass the previously added "num_matches" struct value up to the callers
of unique_tracking_name(). This will allow callers to optionally print
better error messages in a later change.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ævar Arnfjörð Bjarmason
2018-06-05 14:40:46 +00:00
committed by Junio C Hamano
parent e4d2d55ae4
commit 3c87aa946a
4 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
checkout.c
View File

@ -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;