]> git.ipfire.org Git - thirdparty/git.git/blobdiff - remote.c
Documentation: typofix --column description
[thirdparty/git.git] / remote.c
index 9f2450cb51b1257c2baaf0930c3b4ce2d677f693..c3f85c17ca7c79c7d9d9fd12defc36a22089b89c 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -736,6 +736,12 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
         * item uses the destination. To handle this, we apply pattern
         * refspecs in reverse to figure out if the query source matches any
         * of the negative refspecs.
+        *
+        * The first loop finds and expands all positive refspecs
+        * matched by the queried ref.
+        *
+        * The second loop checks if any of the results of the first loop
+        * match any negative refspec.
         */
        for (i = 0; i < rs->nr; i++) {
                struct refspec_item *refspec = &rs->items[i];
@@ -751,9 +757,13 @@ static int query_matches_negative_refspec(struct refspec *rs, struct refspec_ite
 
                        if (match_name_with_pattern(key, needle, value, &expn_name))
                                string_list_append_nodup(&reversed, expn_name);
-               } else {
-                       if (!strcmp(needle, refspec->src))
-                               string_list_append(&reversed, refspec->src);
+               } else if (refspec->matching) {
+                       /* For the special matching refspec, any query should match */
+                       string_list_append(&reversed, needle);
+               } else if (!refspec->src) {
+                       BUG("refspec->src should not be null here");
+               } else if (!strcmp(needle, refspec->src)) {
+                       string_list_append(&reversed, refspec->src);
                }
        }