Merge branch 'ab/pager-exit-log'

[thirdparty/git.git] / remote.c

diff --git a/remote.c b/remote.c
index 8a6dbbb9030ad1464e4c3adf706ad54f1694408c..c3f85c17ca7c79c7d9d9fd12defc36a22089b89c 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -284,7 +284,7 @@ static void read_branches_file(struct remote *remote)
        if (frag)
                *(frag++) = '\0';
        else
-               frag = (char *)git_default_branch_name();
+               frag = (char *)git_default_branch_name(0);
 
        add_url_alias(remote, strbuf_detach(&buf, NULL));
        refspec_appendf(&remote->fetch, "refs/heads/%s:refs/heads/%s",
@@ -355,7 +355,7 @@ static int handle_config(const char *key, const char *value, void *cb)
        remote = make_remote(name, namelen);
        remote->origin = REMOTE_CONFIG;
        if (current_config_scope() == CONFIG_SCOPE_LOCAL ||
-       current_config_scope() == CONFIG_SCOPE_WORKTREE)
+           current_config_scope() == CONFIG_SCOPE_WORKTREE)
                remote->configured_in_repo = 1;
        if (!strcmp(subkey, "mirror"))
                remote->mirror = git_config_bool(key, value);
@@ -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);
                }
        }
 
@@ -2206,7 +2216,8 @@ struct ref *guess_remote_head(const struct ref *head,
 
        /* If a remote branch exists with the default branch name, let's use it. */
        if (!all) {
-               char *ref = xstrfmt("refs/heads/%s", git_default_branch_name());
+               char *ref = xstrfmt("refs/heads/%s",
+                                   git_default_branch_name(0));
 
                r = find_ref_by_name(refs, ref);
                free(ref);