summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:55 -0800
committerJunio C Hamano <gitster@pobox.com>2011-12-19 16:05:55 -0800
commitb3ae9d8e57166c771926e3f55555bf248b71202a (patch)
tree358559721eb8de383691b33f4ff54ff7454d981a /transport.c
parent2e05710a161e6287f239fae42b86b0cb46190834 (diff)
parentbab8d28e774c255a326ad5592af6351e4925efcb (diff)
downloadgit-b3ae9d8e57166c771926e3f55555bf248b71202a.tar.gz
Merge branch 'jk/fetch-no-tail-match-refs'
* jk/fetch-no-tail-match-refs: connect.c: drop path_match function fetch-pack: match refs exactly t5500: give fully-qualified refs to fetch-pack drop "match" parameter from get_remote_heads
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/transport.c b/transport.c
index e9797c0fc7..63f38e3940 100644
--- a/transport.c
+++ b/transport.c
@@ -502,7 +502,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
struct ref *refs;
connect_setup(transport, for_push, 0);
- get_remote_heads(data->fd[0], &refs, 0, NULL,
+ get_remote_heads(data->fd[0], &refs,
for_push ? REF_NORMAL : 0, &data->extra_have);
data->got_remote_heads = 1;
@@ -537,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport,
if (!data->got_remote_heads) {
connect_setup(transport, 0, 0);
- get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL);
+ get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
data->got_remote_heads = 1;
}
@@ -772,8 +772,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
struct ref *tmp_refs;
connect_setup(transport, 1, 0);
- get_remote_heads(data->fd[0], &tmp_refs, 0, NULL, REF_NORMAL,
- NULL);
+ get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL);
data->got_remote_heads = 1;
}