Merge branch 'jc/do-not-let-random-file-interfere-with-completion-tests' into maint

diff --git a/transport.c b/transport.c
index a847bf31e23e9ad0dbc565326cfc21a7cddcc5f5..b9306ef64543d4eb705354ac170d9acc7b735ec5 100644 (file)
--- a/transport.c
+++ b/transport.c
@@ -518,8 +518,7 @@ static int fetch_refs_via_pack(struct transport *transport,
                               int nr_heads, struct ref **to_fetch)
 {
        struct git_transport_data *data = transport->data;
-       struct string_list orig_sought = STRING_LIST_INIT_DUP;
-       struct string_list sought = STRING_LIST_INIT_NODUP;
+       struct string_list sought = STRING_LIST_INIT_DUP;
        const struct ref *refs;
        char *dest = xstrdup(transport->url);
        struct fetch_pack_args args;
@@ -537,10 +536,8 @@ static int fetch_refs_via_pack(struct transport *transport,
        args.no_progress = !transport->progress;
        args.depth = data->options.depth;
 
-       for (i = 0; i < nr_heads; i++) {
-               string_list_append(&orig_sought, to_fetch[i]->name);
-               string_list_append(&sought, orig_sought.items[orig_sought.nr - 1].string);
-       }
+       for (i = 0; i < nr_heads; i++)
+               string_list_append(&sought, to_fetch[i]->name);
 
        if (!data->got_remote_heads) {
                connect_setup(transport, 0, 0);
@@ -561,7 +558,6 @@ static int fetch_refs_via_pack(struct transport *transport,
        free_refs(refs_tmp);
 
        string_list_clear(&sought, 0);
-       string_list_clear(&orig_sought, 0);
        free(dest);
        return (refs ? 0 : -1);
 }
@@ -745,7 +741,7 @@ void transport_print_push_status(const char *dest, struct ref *refs,
                        n += print_one_push_status(ref, dest, n, porcelain);
                if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD &&
                    *nonfastforward != NON_FF_HEAD) {
-                       if (!strcmp(head, ref->name))
+                       if (head != NULL && !strcmp(head, ref->name))
                                *nonfastforward = NON_FF_HEAD;
                        else
                                *nonfastforward = NON_FF_OTHER;