reftable: fix OOB stack write in print functions

[thirdparty/git.git] / merge.c

diff --git a/merge.c b/merge.c
index 6e736881d900bf76f33c1684e411b498e37582bd..2382ff66d351cce20848b6f2ff056258adb2d4d7 100644 (file)
--- a/merge.c
+++ b/merge.c
@@ -53,7 +53,6 @@ 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 = DIR_INIT;
        struct lock_file lock_file = LOCK_INIT;
 
        refresh_index(r->index, REFRESH_QUIET, NULL, NULL, NULL);
@@ -80,11 +79,7 @@ int checkout_fast_forward(struct repository *r,
        }
 
        memset(&opts, 0, sizeof(opts));
-       if (overwrite_ignore) {
-               dir.flags |= DIR_SHOW_IGNORED;
-               setup_standard_excludes(&dir);
-               opts.dir = &dir;
-       }
+       opts.preserve_ignored = !overwrite_ignore;
 
        opts.head_idx = 1;
        opts.src_index = r->index;
@@ -101,7 +96,6 @@ int checkout_fast_forward(struct repository *r,
                clear_unpack_trees_porcelain(&opts);
                return -1;
        }
-       dir_clear(&dir);
        clear_unpack_trees_porcelain(&opts);
 
        if (write_locked_index(r->index, &lock_file, COMMIT_LOCK))