mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

unpack-trees: introduce preserve_ignored to unpack_trees_options

Browse Source 
Currently, every caller of unpack_trees() that wants to ensure ignored
files are overwritten by default needs to:
   * allocate unpack_trees_options.dir
   * flip the DIR_SHOW_IGNORED flag in unpack_trees_options.dir->flags
   * call setup_standard_excludes
AND then after the call to unpack_trees() needs to
   * call dir_clear()
   * deallocate unpack_trees_options.dir
That's a fair amount of boilerplate, and every caller uses identical
code.  Make this easier by instead introducing a new boolean value where
the default value (0) does what we want so that new callers of
unpack_trees() automatically get the appropriate behavior.  And move all
the handling of unpack_trees_options.dir into unpack_trees() itself.

While preserve_ignored = 0 is the behavior we feel is the appropriate
default, we defer fixing commands to use the appropriate default until a
later commit.  So, this commit introduces several locations where we
manually set preserve_ignored=1.  This makes it clear where code paths
were previously preserving ignored files when they should not have been;
a future commit will flip these to instead use a value of 0 to get the
behavior we want.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2021-09-27 16:33:41 +00:00
committed by Junio C Hamano
parent 491a7575f1
commit 04988c8d18
14 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
merge-recursive.c
View File

@ -411,9 +411,7 @@ static int unpack_trees_start(struct merge_options *opt,
else {
opt->priv->unpack_opts.update = 1;
/* FIXME: should only do this if !overwrite_ignore */
CALLOC_ARRAY(opt->priv->unpack_opts.dir, 1);
opt->priv->unpack_opts.dir->flags |= DIR_SHOW_IGNORED;
setup_standard_excludes(opt->priv->unpack_opts.dir);
opt->priv->unpack_opts.preserve_ignored = 0;
}
opt->priv->unpack_opts.merge = 1;
opt->priv->unpack_opts.head_idx = 2;
@ -428,10 +426,6 @@ static int unpack_trees_start(struct merge_options *opt,
init_tree_desc_from_tree(t+2, merge);
rc = unpack_trees(3, t, &opt->priv->unpack_opts);
if (opt->priv->unpack_opts.dir) {
dir_clear(opt->priv->unpack_opts.dir);
FREE_AND_NULL(opt->priv->unpack_opts.dir);
}
cache_tree_free(&opt->repo->index->cache_tree);
/*