diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-10-21 16:04:35 -0700 |
| commit | 470bbbc4dc6a135fd08083c1bd87699ac1b3f742 (patch) | |
| tree | 897b6d17e241c2bebfdf6f518ed1e7f8d4a4cd24 /builtin | |
| parent | 1020fbc2485d6c1c144d321b68fcf37269e67917 (diff) | |
| parent | 29753cddc8007ac63754855d026fe5eca8897d04 (diff) | |
| download | git-470bbbc4dc6a135fd08083c1bd87699ac1b3f742.tar.gz | |
Merge branch 'jc/match-refs-clarify'
* jc/match-refs-clarify:
rename "match_refs()" to "match_push_refs()"
send-pack: typofix error message
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/remote.c | 4 | ||||
| -rw-r--r-- | builtin/send-pack.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/builtin/remote.c b/builtin/remote.c index b25dfb4422..44eb8795cd 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -389,8 +389,8 @@ static int get_push_ref_states(const struct ref *remote_refs, local_refs = get_local_heads(); push_map = copy_ref_list(remote_refs); - match_refs(local_refs, &push_map, remote->push_refspec_nr, - remote->push_refspec, MATCH_REFS_NONE); + match_push_refs(local_refs, &push_map, remote->push_refspec_nr, + remote->push_refspec, MATCH_REFS_NONE); states->push.strdup_strings = 1; for (ref = push_map; ref; ref = ref->next) { diff --git a/builtin/send-pack.c b/builtin/send-pack.c index c1f6ddd927..e0b8030f2b 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -334,7 +334,7 @@ int send_pack(struct send_pack_args *args, demux.data = fd; demux.out = -1; if (start_async(&demux)) - die("receive-pack: unable to fork off sideband demultiplexer"); + die("send-pack: unable to fork off sideband demultiplexer"); in = demux.out; } @@ -509,7 +509,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix) flags |= MATCH_REFS_MIRROR; /* match them up */ - if (match_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags)) + if (match_push_refs(local_refs, &remote_refs, nr_refspecs, refspecs, flags)) return -1; set_ref_status_for_push(remote_refs, args.send_mirror, |