summaryrefslogtreecommitdiff
path: root/builtin-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-14 03:09:52 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-14 03:09:52 -0800
commita108e5386122c75a350e9a191fc727895941ddff (patch)
treed38eb81935464b397d87266203a3779a09cae7db /builtin-fetch.c
parent481424e1f100de690849a9f0348fc78f45ab815e (diff)
parent7c2c6ee7e0259d591acb3d9841cf5417e6b7a8eb (diff)
downloadgit-a108e5386122c75a350e9a191fc727895941ddff.tar.gz
Merge branch 'db/remote-builtin' into jk/send-pack
* db/remote-builtin: Reteach builtin-ls-remote to understand remotes Build in ls-remote Use built-in send-pack. Build-in send-pack, with an API for other programs to call. Build-in peek-remote, using transport infrastructure. Miscellaneous const changes and utilities Conflicts: transport.c
Diffstat (limited to 'builtin-fetch.c')
-rw-r--r--builtin-fetch.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c
index 5f5b59bfdb..6b1750d28b 100644
--- a/builtin-fetch.c
+++ b/builtin-fetch.c
@@ -29,7 +29,7 @@ static void unlock_pack_on_signal(int signo)
}
static void add_merge_config(struct ref **head,
- struct ref *remote_refs,
+ const struct ref *remote_refs,
struct branch *branch,
struct ref ***tail)
{
@@ -77,7 +77,7 @@ static struct ref *get_ref_map(struct transport *transport,
struct ref *ref_map = NULL;
struct ref **tail = &ref_map;
- struct ref *remote_refs = transport_get_remote_refs(transport);
+ const struct ref *remote_refs = transport_get_remote_refs(transport);
if (ref_count || tags) {
for (i = 0; i < ref_count; i++) {
@@ -354,12 +354,12 @@ static struct ref *find_non_local_tags(struct transport *transport,
struct path_list new_refs = { NULL, 0, 0, 1 };
char *ref_name;
int ref_name_len;
- unsigned char *ref_sha1;
- struct ref *tag_ref;
+ const unsigned char *ref_sha1;
+ const struct ref *tag_ref;
struct ref *rm = NULL;
struct ref *ref_map = NULL;
struct ref **tail = &ref_map;
- struct ref *ref;
+ const struct ref *ref;
for_each_ref(add_existing, &existing_refs);
for (ref = transport_get_remote_refs(transport); ref; ref = ref->next) {