diff options
| author | Carlos Martín Nieto <cmn@elego.de> | 2012-01-11 13:12:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-01-11 19:21:22 -0800 |
| commit | 0f544ee897ac2cc760f29d3568cc4295ca69fd1f (patch) | |
| tree | 82e0062f4bab2d1a917bd030f14517c22e50c742 /archive.c | |
| parent | 7b51c33b376d22195dba1c4e067180164fd35dbf (diff) | |
| download | git-0f544ee897ac2cc760f29d3568cc4295ca69fd1f.tar.gz git-0f544ee897ac2cc760f29d3568cc4295ca69fd1f.tar.xz | |
archive: re-allow HEAD:Documentation on a remote invocation
The tightening done in (ee27ca4a: archive: don't let remote clients
get unreachable commits, 2011-11-17) went too far and disallowed
HEAD:Documentation as it would try to find "HEAD:Documentation" as a
ref.
Only DWIM the "HEAD" part to see if it exists as a ref. Once we're
sure that we've been given a valid ref, we follow the normal code
path. This still disallows attempts to access commits which are not
branch tips.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive.c')
| -rw-r--r-- | archive.c | 21 |
1 files changed, 15 insertions, 6 deletions
@@ -260,14 +260,23 @@ static void parse_treeish_arg(const char **argv, /* Remotes are only allowed to fetch actual refs */ if (remote) { char *ref = NULL; - if (!dwim_ref(name, strlen(name), sha1, &ref)) - die("no such ref: %s", name); + 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); free(ref); } - else { - if (get_sha1(name, sha1)) - die("Not a valid object name"); - } + + if (get_sha1(name, sha1)) + die("Not a valid object name"); commit = lookup_commit_reference_gently(sha1, 1); if (commit) { |