From: SZEDER Gábor <szeder.dev@gmail.com>
Date: Thu, 23 Mar 2017 15:50:12 +0000 (+0100)
Subject: refs.c: use skip_prefix() in prettify_refname()
X-Git-Tag: v2.13.0-rc0~55^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/3e5b36c6378da0be3f5371cb1f2a3f84e1952fae

refs.c: use skip_prefix() in prettify_refname()

This eliminates three magic numbers.

Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/refs.c b/refs.c
index 62055ab091..49a7e703d5 100644
--- a/refs.c
+++ b/refs.c
@@ -346,11 +346,11 @@ int for_each_glob_ref(each_ref_fn fn, const char *pattern, void *cb_data)
 
 const char *prettify_refname(const char *name)
 {
-	return name + (
-		starts_with(name, "refs/heads/") ? 11 :
-		starts_with(name, "refs/tags/") ? 10 :
-		starts_with(name, "refs/remotes/") ? 13 :
-		0);
+	if (skip_prefix(name, "refs/heads/", &name) ||
+	    skip_prefix(name, "refs/tags/", &name) ||
+	    skip_prefix(name, "refs/remotes/", &name))
+		; /* nothing */
+	return name;
 }
 
 static const char *ref_rev_parse_rules[] = {