From: René Scharfe <l.s.r@web.de>
Date: Tue, 26 Nov 2019 15:23:31 +0000 (+0100)
Subject: name-rev: use skip_prefix() instead of starts_with()
X-Git-Tag: v2.25.0-rc0~61^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2059e79c0dac1e1e4e55733618dc6ca9d00b8aa4;p=thirdparty%2Fgit.git

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

Let skip_prefix() advance refname to get rid of two magic numbers.

Signed-off-by: René Scharfe <l.s.r@web.de>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index b0f0776947..e55a4f04ee 100644
--- 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;
 }