summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2013-02-20 20:06:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-02-24 08:17:38 (GMT)
commit85edf4f58b5368e2f2acc4bce0d10e1ca9d6c879 (patch)
tree8aebba6d7b9df301e6e9144eaf98ebda021424be /builtin
parent4981fe750b1fc58bfdf5b9ca9843f4f505b9bb4d (diff)
downloadgit-85edf4f58b5368e2f2acc4bce0d10e1ca9d6c879.zip
git-85edf4f58b5368e2f2acc4bce0d10e1ca9d6c879.tar.gz
git-85edf4f58b5368e2f2acc4bce0d10e1ca9d6c879.tar.bz2
teach get_remote_heads to read from a memory buffer
Now that we can read packet data from memory as easily as a descriptor, get_remote_heads can take either one as a source. This will allow further refactoring in remote-curl. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
-rw-r--r--builtin/fetch-pack.c2
-rw-r--r--builtin/send-pack.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c
index c21cc2c..03ed2ca 100644
--- a/builtin/fetch-pack.c
+++ b/builtin/fetch-pack.c
@@ -125,7 +125,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
args.verbose ? CONNECT_VERBOSE : 0);
}
- get_remote_heads(fd[0], &ref, 0, NULL);
+ get_remote_heads(fd[0], NULL, 0, &ref, 0, NULL);
ref = fetch_pack(&args, fd, conn, ref, dest,
&sought, pack_lockfile_ptr);
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 8778519..152c4ea 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -207,7 +207,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
memset(&extra_have, 0, sizeof(extra_have));
- get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
+ get_remote_heads(fd[0], NULL, 0, &remote_refs, REF_NORMAL, &extra_have);
transport_verify_remote_names(nr_refspecs, refspecs);