kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

upload-pack: move rev-list code out of check_non_tip() 

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Nguyễn Thái Ngọc Duy 2016-06-12 17:53:52 +07:00 committed by Junio C Hamano
parent 7fcbd37f9c
commit 3f0f6624f5
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
upload-pack.c
View File

@ -451,7 +451,7 @@ static int is_our_ref(struct object *o)
return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF); return o->flags & ((allow_hidden_ref ? HIDDEN_REF : 0) | OUR_REF);
} }


static void check_non_tip(void) static int has_unreachable(struct object_array *src)
{ {
static const char *argv[] = { static const char *argv[] = {
"rev-list", "--stdin", NULL, "rev-list", "--stdin", NULL,
@ -461,14 +461,6 @@ static void check_non_tip(void)
char namebuf[42]; /* ^ + SHA-1 + LF */ char namebuf[42]; /* ^ + SHA-1 + LF */
int i; int i;


/*
* In the normal in-process case without
* uploadpack.allowReachableSHA1InWant,
* non-tip requests can never happen.
*/
if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
goto error;

cmd.argv = argv; cmd.argv = argv;
cmd.git_cmd = 1; cmd.git_cmd = 1;
cmd.no_stderr = 1; cmd.no_stderr = 1;
@ -498,8 +490,8 @@ static void check_non_tip(void)
goto error; goto error;
} }
namebuf[40] = '\n'; namebuf[40] = '\n';
for (i = 0; i < want_obj.nr; i++) { for (i = 0; i < src->nr; i++) {
o = want_obj.objects[i].item; o = src->objects[i].item;
if (is_our_ref(o)) if (is_our_ref(o))
continue; continue;
memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ); memcpy(namebuf, oid_to_hex(&o->oid), GIT_SHA1_HEXSZ);
@ -530,7 +522,7 @@ static void check_non_tip(void)
sigchain_pop(SIGPIPE); sigchain_pop(SIGPIPE);


/* All the non-tip ones are ancestors of what we advertised */ /* All the non-tip ones are ancestors of what we advertised */
return; return 0;


error: error:
sigchain_pop(SIGPIPE); sigchain_pop(SIGPIPE);
@ -539,10 +531,28 @@ error:
close(cmd.in); close(cmd.in);
if (cmd.out >= 0) if (cmd.out >= 0)
close(cmd.out); close(cmd.out);
return 1;
}


static void check_non_tip(void)
{
int i;

/*
* In the normal in-process case without
* uploadpack.allowReachableSHA1InWant,
* non-tip requests can never happen.
*/
if (!stateless_rpc && !(allow_unadvertised_object_request & ALLOW_REACHABLE_SHA1))
goto error;
if (!has_unreachable(&want_obj))
/* All the non-tip ones are ancestors of what we advertised */
return;

error:
/* Pick one of them (we know there at least is one) */ /* Pick one of them (we know there at least is one) */
for (i = 0; i < want_obj.nr; i++) { for (i = 0; i < want_obj.nr; i++) {
o = want_obj.objects[i].item; struct object *o = want_obj.objects[i].item;
if (!is_our_ref(o)) if (!is_our_ref(o))
die("git upload-pack: not our ref %s", die("git upload-pack: not our ref %s",
oid_to_hex(&o->oid)); oid_to_hex(&o->oid));