diff options
author | Junio C Hamano <gitster@pobox.com> | 2007-11-24 16:45:37 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2007-11-24 16:45:37 -0800 |
commit | fd200790dc518f297bfd538a53e232802904f1de (patch) | |
tree | 09347c007dd813b86fe3ff58d897997b7e8aac49 /builtin-fetch.c | |
parent | 6c6ea3800d1eace51994d90fbeb19ffe918e63b0 (diff) | |
parent | 07f507155d01af0fdc8aa179b6a779301168b1eb (diff) | |
download | git-fd200790dc518f297bfd538a53e232802904f1de.tar.gz |
Merge branch 'jk/send-pack'
* jk/send-pack: (24 commits)
send-pack: cluster ref status reporting
send-pack: fix "everything up-to-date" message
send-pack: tighten remote error reporting
make "find_ref_by_name" a public function
Fix warning about bitfield in struct ref
send-pack: assign remote errors to each ref
send-pack: check ref->status before updating tracking refs
send-pack: track errors for each ref
git-push: add documentation for the newly added --mirror mode
Add tests for git push'es mirror mode
Update the tracking references only if they were succesfully updated on remote
Add a test checking if send-pack updated local tracking branches correctly
git-push: plumb in --mirror mode
Teach send-pack a mirror mode
send-pack: segfault fix on forced push
Reteach builtin-ls-remote to understand remotes
send-pack: require --verbose to show update of tracking refs
receive-pack: don't mention successful updates
more terse push output
Build in ls-remote
...
Diffstat (limited to 'builtin-fetch.c')
-rw-r--r-- | builtin-fetch.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/builtin-fetch.c b/builtin-fetch.c index be9e3ea2bc..31e138eab8 100644 --- a/builtin-fetch.c +++ b/builtin-fetch.c @@ -31,7 +31,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) { @@ -79,7 +79,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++) { @@ -424,12 +424,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) { |