summaryrefslogtreecommitdiff
path: root/archive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-05-23 20:35:22 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-23 20:35:22 (GMT)
commitb83cfa5949081c32a13b84e8aeea7d2cb7a96331 (patch)
treeab7d7cc080ea030b18f9110013f140cb3a656b14 /archive.c
parent8d19426f985afdf4cc34f88198226964566dcdc1 (diff)
parentbf38245be8f481ac1c08a98951b7fd00bbfc15ea (diff)
downloadgit-b83cfa5949081c32a13b84e8aeea7d2cb7a96331.zip
git-b83cfa5949081c32a13b84e8aeea7d2cb7a96331.tar.gz
git-b83cfa5949081c32a13b84e8aeea7d2cb7a96331.tar.bz2
Merge branch 'rs/archive-tree-in-tip-simplify'
By René Scharfe * rs/archive-tree-in-tip-simplify: archive-tar: keep const in checksum calculation archive: simplify refname handling
Diffstat (limited to 'archive.c')
-rw-r--r--archive.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/archive.c b/archive.c
index cd083ea..a484433 100644
--- a/archive.c
+++ b/archive.c
@@ -254,18 +254,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);
}