Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null'
authorJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2015 18:15:27 +0000 (10:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 17 Feb 2015 18:15:27 +0000 (10:15 -0800)
Fix a misspelled conditional that is always true.

* jk/remote-curl-an-array-in-struct-cannot-be-null:
do not check truth value of flex arrays

1  2 
remote-curl.c
diff --cc remote-curl.c
index dd63bc27abf8ae4b9e480ba1bb88942db11a0e48,38cab05ec52585c886e09f58acb2511c9209cbcb..515ac9b411a211936a575628706a30ea4a2ccc3f
@@@ -755,17 -511,14 +755,17 @@@ static int fetch_git(struct discovery *
                depth_arg = strbuf_detach(&buf, NULL);
                argv[argc++] = depth_arg;
        }
 -      argv[argc++] = url;
 +      argv[argc++] = url.buf;
 +      argv[argc++] = NULL;
 +
        for (i = 0; i < nr_heads; i++) {
                struct ref *ref = to_fetch[i];
-               if (!ref->name || !*ref->name)
+               if (!*ref->name)
                        die("cannot fetch by sha1 over smart http");
 -              argv[argc++] = ref->name;
 +              packet_buf_write(&preamble, "%s %s\n",
 +                               sha1_to_hex(ref->old_sha1), ref->name);
        }
 -      argv[argc++] = NULL;
 +      packet_buf_flush(&preamble);
  
        memset(&rpc, 0, sizeof(rpc));
        rpc.service_name = "git-upload-pack",