summaryrefslogtreecommitdiff
path: root/builtin/send-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-10-21 23:04:35 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-10-21 23:04:35 (GMT)
commit470bbbc4dc6a135fd08083c1bd87699ac1b3f742 (patch)
tree897b6d17e241c2bebfdf6f518ed1e7f8d4a4cd24 /builtin/send-pack.c
parent1020fbc2485d6c1c144d321b68fcf37269e67917 (diff)
parent29753cddc8007ac63754855d026fe5eca8897d04 (diff)
downloadgit-470bbbc4dc6a135fd08083c1bd87699ac1b3f742.zip
git-470bbbc4dc6a135fd08083c1bd87699ac1b3f742.tar.gz
git-470bbbc4dc6a135fd08083c1bd87699ac1b3f742.tar.bz2
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/send-pack.c')
-rw-r--r--builtin/send-pack.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index c1f6ddd..e0b8030 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,