[PATCH] archive: re-allow HEAD:Documentation on a remote invocation
- From
Carlos Martín Nieto <cmn@elego.de>
- Date
- Jan 11, 2012, 12:12 UTC
- Message-ID
- <1326283958-30271-1-git-send-email-cmn@elego.de>
- In-Reply-To
- <20120110232132.GA29245@sigill.intra.peff.net>
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> ---
AFAICT this should still be safe. Using HEAD^:Documentation or <sha1>:Documentation still complains that HEAD^ and <sha1> aren't refs.
archive.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c index 164bbd0..4735bfb 100644 --- a/archive.c +++ b/archive.c @@ -260,14 +260,21 @@ 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); 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) {
-- 1.7.8.352.g876a6f