From: René Scharfe <l.s.r@web.de>
Date: Thu, 10 Aug 2017 16:47:55 +0000 (+0200)
Subject: merge: use skip_prefix()
X-Git-Tag: v2.14.2~14^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de3ce210edb4870b082fab18148f859d2b3c9ae2?ds=inline;hp=--cc

merge: use skip_prefix()

Get rid of a magic string length constant by using skip_prefix() instead
of starts_with().

Signed-off-by: Rene Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

de3ce210edb4870b082fab18148f859d2b3c9ae2
diff --git a/builtin/merge.c b/builtin/merge.c
index 703827f006..d9db0baaf3 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -1118,8 +1118,8 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
 	 * current branch.
 	 */
 	branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
-	if (branch && starts_with(branch, "refs/heads/"))
-		branch += 11;
+	if (branch)
+		skip_prefix(branch, "refs/heads/", &branch);
 	if (!branch || is_null_oid(&head_oid))
 		head_commit = NULL;
 	else