path: root/merge.c
diff options
authorÆvar Arnfjörð Bjarmason <>2021-07-01 10:51:27 (GMT)
committerJunio C Hamano <>2021-07-01 19:32:22 (GMT)
commitce93a4c6127abdf1ad9eacd537edd1c571a18e41 (patch)
treef5393dbc3f3ce9cd98ba2aa5d7f015b1bd796a30 /merge.c
parent5726a6b4012cd41701927a6637b9f2070e7760ee (diff)
dir.[ch]: replace dir_init() with DIR_INIT
Remove the dir_init() function and replace it with a DIR_INIT macro. In many cases in the codebase we need to initialize things with a function for good reasons, e.g. needing to call another function on initialization. The "dir_init()" function was not one such case, and could trivially be replaced with a more idiomatic macro initialization pattern. The only place where we made use of its use of memset() was in dir_clear() itself, which resets the contents of an an existing struct pointer. Let's use the new "memcpy() a 'blank' struct on the stack" idiom to do that reset. Signed-off-by: Ævar Arnfjörð Bjarmason <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'merge.c')
1 files changed, 1 insertions, 2 deletions
diff --git a/merge.c b/merge.c
index 5fb88af..6e73688 100644
--- a/merge.c
+++ b/merge.c
@@ -53,7 +53,7 @@ int checkout_fast_forward(struct repository *r,
struct unpack_trees_options opts;
struct tree_desc t[MAX_UNPACK_TREES];
int i, nr_trees = 0;
- struct dir_struct dir;
+ struct dir_struct dir = DIR_INIT;
struct lock_file lock_file = LOCK_INIT;
refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -80,7 +80,6 @@ int checkout_fast_forward(struct repository *r,
memset(&opts, 0, sizeof(opts));
- dir_init(&dir);
if (overwrite_ignore) {
dir.flags |= DIR_SHOW_IGNORED;