path: root/help.c
diff options
authorJeff King <>2019-05-14 12:05:05 (GMT)
committerJunio C Hamano <>2019-05-15 01:58:02 (GMT)
commit2ed2e19958f2bcf59cac18a69b27f74ba7079a2f (patch)
tree356c3b377d3c0c6b7c8c8b2f49d1acaf5ee10997 /help.c
parent8ed51b066681adc88723dbe07b878904c348fdf6 (diff)
help_unknown_ref(): check for refname ambiguity
When the user asks to merge "foo" and we suggest "origin/foo" instead, we do so by simply chopping off "refs/remotes/" from the front of the suggested ref. This is usually fine, but it's possible that the resulting name is ambiguous (e.g., you have "refs/heads/origin/foo", too). Let's use shorten_unambiguous_ref() to do this the right way, which should usually yield the same "origin/foo", but "remotes/origin/foo" if necessary. Note that in this situation there may be other options (e.g., we could suggest "heads/origin/foo" as well). I'll leave that up for debate; the focus here is just to avoid giving advice that does not actually do what we expect. Signed-off-by: Jeff King <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'help.c')
1 files changed, 3 insertions, 3 deletions
diff --git a/help.c b/help.c
index 5583f6c..602d9fa 100644
--- a/help.c
+++ b/help.c
@@ -761,12 +761,12 @@ static int append_similar_ref(const char *refname, const struct object_id *oid,
struct similar_ref_cb *cb = (struct similar_ref_cb *)(cb_data);
char *branch = strrchr(refname, '/') + 1;
- const char *remote;
/* A remote branch of the same name is deemed similar */
- if (skip_prefix(refname, "refs/remotes/", &remote) &&
+ if (starts_with(refname, "refs/remotes/") &&
!strcmp(branch, cb->base_ref))
- string_list_append(cb->similar_refs, remote);
+ string_list_append_nodup(cb->similar_refs,
+ shorten_unambiguous_ref(refname, 1));
return 0;