summaryrefslogtreecommitdiff
path: root/http-push.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 /http-push.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 'http-push.c')
-rw-r--r--http-push.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http-push.c b/http-push.c
index 5d01be9..edd553b 100644
--- a/http-push.c
+++ b/http-push.c
@@ -1869,8 +1869,8 @@ int main(int argc, char **argv)
}
/* match them up */
- if (match_refs(local_refs, &remote_refs,
- nr_refspec, (const char **) refspec, push_all)) {
+ if (match_push_refs(local_refs, &remote_refs,
+ nr_refspec, (const char **) refspec, push_all)) {
rc = -1;
goto cleanup;
}