diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 09:39:24 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2008-09-25 09:39:24 -0700 |
| commit | 1ad6d46235d135582d5cbb91ec0186b485c7b5c1 (patch) | |
| tree | e4a98d08b88862305d9f13ccef82180de33e8bcc /builtin-fetch-pack.c | |
| parent | 6ef1daf77202aee71056771d91dd12121c6061fd (diff) | |
| parent | d79796bcf05b89774671a75b3285000c43129823 (diff) | |
| download | git-1ad6d46235d135582d5cbb91ec0186b485c7b5c1.tar.gz git-1ad6d46235d135582d5cbb91ec0186b485c7b5c1.tar.xz | |
Merge branch 'jc/alternate-push'
* jc/alternate-push:
push: receiver end advertises refs from alternate repositories
push: prepare sender to receive extended ref information from the receiver
receive-pack: make it a builtin
is_directory(): a generic helper function
Diffstat (limited to 'builtin-fetch-pack.c')
| -rw-r--r-- | builtin-fetch-pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-fetch-pack.c b/builtin-fetch-pack.c index 4dfef29bc..fa3c93649 100644 --- a/builtin-fetch-pack.c +++ b/builtin-fetch-pack.c @@ -735,7 +735,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) conn = git_connect(fd, (char *)dest, args.uploadpack, args.verbose ? CONNECT_VERBOSE : 0); if (conn) { - get_remote_heads(fd[0], &ref, 0, NULL, 0); + get_remote_heads(fd[0], &ref, 0, NULL, 0, NULL); ref = fetch_pack(&args, fd, conn, ref, dest, nr_heads, heads, NULL); close(fd[0]); |