Merge branch 'jk/remote-curl-an-array-in-struct-cannot-be-null' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:35 +0000 (22:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 25 Feb 2015 06:10:35 +0000 (22:10 -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
@@@ -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",