upload-pack: strip refs before calling ref_is_hidden()

lfos · gitster · commit 00b293e519d1 · 2015-11-05T11:25:02.000-08:00
Make hideRefs handling in upload-pack consistent with the behavior
described in the documentation by stripping refs before comparing them
with prefixes in hideRefs.

Signed-off-by: Lukas Fleischer &lt;lfleischer@lfos.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/upload-pack.c b/upload-pack.c
@@ -692,7 +692,7 @@ static int mark_our_ref(const char *refname, const struct object_id *oid)
 {
 	struct object *o = lookup_unknown_object(oid->hash);
 
-	if (ref_is_hidden(refname)) {
+	if (refname && ref_is_hidden(refname)) {
 		o->flags |= HIDDEN_REF;
 		return 1;
 	}
@@ -703,7 +703,7 @@ static int mark_our_ref(const char *refname, const struct object_id *oid)
 static int check_ref(const char *refname, const struct object_id *oid,
 		     int flag, void *cb_data)
 {
-	mark_our_ref(refname, oid);
+	mark_our_ref(strip_namespace(refname), oid);
 	return 0;
 }
 
@@ -726,7 +726,7 @@ static int send_ref(const char *refname, const struct object_id *oid,
 	const char *refname_nons = strip_namespace(refname);
 	struct object_id peeled;
 
-	if (mark_our_ref(refname, oid))
+	if (mark_our_ref(refname_nons, oid))
 		return 0;
 
 	if (capabilities) {

Original file line number	Diff line number	Diff line change
`@@ -692,7 +692,7 @@ static int mark_our_ref(const char refname, const struct object_id oid)`
`692`	`692`	`{`
`693`	`693`	`struct object *o = lookup_unknown_object(oid->hash);`
`694`	`694`
`695`		`- if (ref_is_hidden(refname)) {`
	`695`	`+ if (refname && ref_is_hidden(refname)) {`
`696`	`696`	`o->flags \|= HIDDEN_REF;`
`697`	`697`	`return 1;`
`698`	`698`	`}`
`@@ -703,7 +703,7 @@ static int mark_our_ref(const char refname, const struct object_id oid)`
`703`	`703`	`static int check_ref(const char refname, const struct object_id oid,`
`704`	`704`	`int flag, void *cb_data)`
`705`	`705`	`{`
`706`		`- mark_our_ref(refname, oid);`
	`706`	`+ mark_our_ref(strip_namespace(refname), oid);`
`707`	`707`	`return 0;`
`708`	`708`	`}`
`709`	`709`
`@@ -726,7 +726,7 @@ static int send_ref(const char refname, const struct object_id oid,`
`726`	`726`	`const char *refname_nons = strip_namespace(refname);`
`727`	`727`	`struct object_id peeled;`
`728`	`728`
`729`		`- if (mark_our_ref(refname, oid))`
	`729`	`+ if (mark_our_ref(refname_nons, oid))`
`730`	`730`	`return 0;`
`731`	`731`
`732`	`732`	`if (capabilities) {`