Thread (1 message) 1 message, 1 author, 2016-06-15

Re: [PATCH 2/3] Move refspec parser from connect.c and cache.h to remote.{c,h}

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:09

Daniel Barkalow [off-list ref] writes:
quoted hunk
diff --git a/remote.c b/remote.c
index 1dd2e77..2ac7bc8 100644
--- a/remote.c
+++ b/remote.c
@@ -181,6 +181,44 @@ static void read_config(void)
+ ...
+static int match_explicit_refs(struct ref *src, struct ref *dst,
+			       struct ref ***dst_tail, struct refspec *rs,
+			       int rs_nr)
+{
+	int i, errs;
+	for (i = errs = 0; i < rs_nr; i++) {
+		struct ref *matched_src, *matched_dst;
+
+		const char *dest = rs[i].dest;
+		if (dest == NULL)
+			dest = rs[i].src;
I am not a big fan of gratuitous renaming of structure members
and variables such as this s/dst/dest/, especially when the
change breaks consistency (between src vs dst -- you left
matched_dst intact).
...
+		switch (count_refspec_match(dest, dst, &matched_dst)) {
...
+		case 0:
+			if (!memcmp(dest, "refs/", 5)) {
...
+			else {
+				errs = 1;
+				error("dst refspec %s does not match any "
+				      "existing ref on the remote and does "
+				      "not start with refs/.", rs[i].dest);
+			}
I think you meant to say 'dest' instead of 'rs[i].dest' here.
+...
+	}
+	return -errs;
+}
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help