shallow.c: extend setup_*_shallow() to accept extra shallow commits

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy
2013-12-05 20:02:34 +07:00
committed by Junio C Hamano
parent b06dcd7d68
commit 1a30f5a2f2
4 changed files with 24 additions and 11 deletions

View File

@ -311,7 +311,7 @@ static int find_common(struct fetch_pack_args *args,
}
if (is_repository_shallow())
write_shallow_commits(&req_buf, 1);
write_shallow_commits(&req_buf, 1, NULL);
if (args->depth > 0)
packet_buf_write(&req_buf, "deepen %d", args->depth);
packet_buf_flush(&req_buf);
@ -850,7 +850,8 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args,
if (args->stateless_rpc)
packet_flush(fd[1]);
if (args->depth > 0)
setup_alternate_shallow(&shallow_lock, &alternate_shallow_file);
setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
NULL);
else
alternate_shallow_file = NULL;
if (get_pack(args, fd, pack_lockfile))