From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Tue, 12 Jul 2005 01:03:34 +0000 (-0700)
Subject: git-send-pack: Fix duplicate refname match
X-Git-Tag: v0.99.1~57
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e33b2ef8f59a136402ae434cc743408300d69e9a;p=git.git

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.
---

diff --git a/send-pack.c b/send-pack.c
index 4c6adabda..8ff61d1c4 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;