name-rev: use skip_prefix() instead of starts_with()

rscharfe · gitster · commit 2059e79c0dac · 2019-11-27T11:21:18.000+09:00
Let skip_prefix() advance refname to get rid of two magic numbers.

Signed-off-by: René Scharfe &lt;l.s.r@web.de&gt;
Acked-by: Jeff King &lt;peff@peff.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
@@ -161,10 +161,10 @@ static const char *name_ref_abbrev(const char *refname, int shorten_unambiguous)
 {
 	if (shorten_unambiguous)
 		refname = shorten_unambiguous_ref(refname, 0);
-	else if (starts_with(refname, "refs/heads/"))
-		refname = refname + 11;
-	else if (starts_with(refname, "refs/"))
-		refname = refname + 5;
+	else if (skip_prefix(refname, "refs/heads/", &refname))
+		; /* refname already advanced */
+	else
+		skip_prefix(refname, "refs/", &refname);
 	return refname;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -161,10 +161,10 @@ static const char name_ref_abbrev(const char refname, int shorten_unambiguous)`
`161`	`161`	`{`
`162`	`162`	`if (shorten_unambiguous)`
`163`	`163`	`refname = shorten_unambiguous_ref(refname, 0);`
`164`		`- else if (starts_with(refname, "refs/heads/"))`
`165`		`- refname = refname + 11;`
`166`		`- else if (starts_with(refname, "refs/"))`
`167`		`- refname = refname + 5;`
	`164`	`+ else if (skip_prefix(refname, "refs/heads/", &refname))`
	`165`	`+ ; /* refname already advanced */`
	`166`	`+ else`
	`167`	`+ skip_prefix(refname, "refs/", &refname);`
`168`	`168`	`return refname;`
`169`	`169`	`}`
`170`	`170`