From: René Scharfe <rene.scharfe@lsrfire.ath.cx>
Date: Fri, 18 May 2012 05:15:17 +0000 (+0200)
Subject: archive: simplify refname handling
X-Git-Tag: v1.7.11-rc0~15^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c51a351a6bcc64ad8cb2ed5a6ebde54b8d50eef1?hp=--cc

archive: simplify refname handling

There is no need to build a copy of the relevant part of the string just
to make sure we have a NUL-terminated string.  We can simply pass the
length of the interesting part to dwim_ref() instead.

Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

c51a351a6bcc64ad8cb2ed5a6ebde54b8d50eef1
diff --git a/archive.c b/archive.c
index 1ee837d717..1e7156d580 100644
--- a/archive.c
+++ b/archive.c
@@ -260,18 +260,11 @@ static void parse_treeish_arg(const char **argv,
 	/* Remotes are only allowed to fetch actual refs */
 	if (remote) {
 		char *ref = NULL;
-		const char *refname, *colon = NULL;
-
-		colon = strchr(name, ':');
-		if (colon)
-			refname = xstrndup(name, colon - name);
-		else
-			refname = name;
-
-		if (!dwim_ref(refname, strlen(refname), sha1, &ref))
-			die("no such ref: %s", refname);
-		if (refname != name)
-			free((void *)refname);
+		const char *colon = strchr(name, ':');
+		int refnamelen = colon ? colon - name : strlen(name);
+
+		if (!dwim_ref(name, refnamelen, sha1, &ref))
+			die("no such ref: %.*s", refnamelen, name);
 		free(ref);
 	}