http: always warn if libcurl version is too old

diff --git a/commit.h b/commit.h
index ed2a1f0265506ff7153d9b8ea584ca268180a0c3..15ee924f2f02998d742464de6c31b55d391426b3 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -356,7 +356,7 @@ extern void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *
 
 struct merge_remote_desc {
        struct object *obj; /* the named object, could be a tag */
-       const char *name;
+       char name[FLEX_ARRAY];
 };
 #define merge_remote_util(commit) ((struct merge_remote_desc *)((commit)->util))
 extern void set_merge_remote_desc(struct commit *commit,