Merge branch 'jk/maint-upload-archive'

* jk/maint-upload-archive:
  archive: re-allow HEAD:Documentation on a remote invocation
This commit is contained in:
Junio C Hamano 2012-01-12 23:34:17 -08:00
Родитель c4a01a3cbb 0f544ee897
Коммит bdb8cb5296
1 изменённых файлов: 15 добавлений и 6 удалений

Просмотреть файл

@ -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) {