aboutsummaryrefslogtreecommitdiff
path: root/submodule.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-09-27 15:02:13 -0700
committerJunio C Hamano <gitster@pobox.com>2021-09-27 15:02:13 -0700
commita30321b9eaede5a1d639936d212e2d0fc8d414c8 (patch)
tree56806f1b45ec4b31eaa6dc182d42798703d16d8e /submodule.h
parentddb1055343948e0d0bc81f8d20245f1ada6430a0 (diff)
parent538835d2ac151abbe90058becfc0dc061d33302c (diff)
downloadgit-a30321b9eaede5a1d639936d212e2d0fc8d414c8.tar.xz
Merge branch 'ab/designated-initializers' into ab/designated-initializers-more
* ab/designated-initializers: cbtree.h: define cb_init() in terms of CBTREE_INIT *.h: move some *_INIT to designated initializers *.h _INIT macros: don't specify fields equal to 0 *.[ch] *_INIT macros: use { 0 } for a "zero out" idiom submodule-config.h: remove unused SUBMODULE_INIT macro
Diffstat (limited to 'submodule.h')
-rw-r--r--submodule.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h
index 4578e501b8..6bd2c99fd9 100644
--- a/submodule.h
+++ b/submodule.h
@@ -37,7 +37,9 @@ struct submodule_update_strategy {
enum submodule_update_type type;
const char *command;
};
-#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
+#define SUBMODULE_UPDATE_STRATEGY_INIT { \
+ .type = SM_UPDATE_UNSPECIFIED, \
+}
int is_gitmodules_unmerged(struct index_state *istate);
int is_writing_gitmodules_ok(void);