summaryrefslogtreecommitdiff
path: root/send-pack.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 01:03:34 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 01:03:34 (GMT)
commite33b2ef8f59a136402ae434cc743408300d69e9a (patch)
treed42dd6afcc5a3f5a251f75c30b569d69fce30f4b /send-pack.c
parentb1de9de2b93510affbbac2a4ffa47208b3beda7a (diff)
downloadgit-e33b2ef8f59a136402ae434cc743408300d69e9a.zip
git-e33b2ef8f59a136402ae434cc743408300d69e9a.tar.gz
git-e33b2ef8f59a136402ae434cc743408300d69e9a.tar.bz2
git-send-pack: Fix duplicate refname match
Cut-and-paste dup noticed by Junio. It's not even harmless, since a match also causes that match to be invalidated, so this made it impossible to update an existing branch by name. I'd only tested the case of "ref doesn't exist at all on the other end", which worked fine.
Diffstat (limited to 'send-pack.c')
-rw-r--r--send-pack.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/send-pack.c b/send-pack.c
index 4c6adab..8ff61d1 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -204,9 +204,6 @@ static int send_pack(int in, int out, int nr_match, char **match)
if (read_ref(name, new_sha1) < 0)
continue;
- if (nr_match && !path_match(name, nr_match, match))
- continue;
-
if (!memcmp(ref->old_sha1, new_sha1, 20)) {
fprintf(stderr, "'%s' unchanged\n", name);
continue;