X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=help.c;h=5261d83ecf15042d8babccf9779f0b96fac94e92;hb=4a58c3d7f7a83ebcd4ede635871cab7be24f7f3f;hp=a9e451f2ee7a165eecb17746db9cc1a2f7e2cfbb;hpb=292a0de9982aff5e4f952214c1b9f762d8a1585a;p=thirdparty%2Fgit.git

diff --git a/help.c b/help.c
index a9e451f2ee..5261d83ecf 100644
--- a/help.c
+++ b/help.c
@@ -754,19 +754,19 @@ 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;
 }
 
 static struct string_list guess_refs(const char *ref)
 {
 	struct similar_ref_cb ref_cb;
-	struct string_list similar_refs = STRING_LIST_INIT_NODUP;
+	struct string_list similar_refs = STRING_LIST_INIT_DUP;
 
 	ref_cb.base_ref = ref;
 	ref_cb.similar_refs = &similar_refs;