diff options
| author |  Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-12-05 20:02:34 +0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-12-10 16:14:16 -0800 |
| commit | 1a30f5a2f2a3d5d9b3cf6e126ac19deb40324515 (patch) | |
| tree | 048a4bc9a247a9386dcf40eb01a5de6b7b3713fb /fetch-pack.c | |
| parent | connect.c: teach get_remote_heads to parse "shallow" lines (diff) | |
| download | tgif-1a30f5a2f2a3d5d9b3cf6e126ac19deb40324515.tar.xz | |
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>
Diffstat (limited to 'fetch-pack.c')
| -rw-r--r-- | fetch-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fetch-pack.c b/fetch-pack.c index 1042448fa0..0e7483e1fe 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -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)) |