summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2021-09-27 16:33:41 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-27 13:38:37 -0700
commit04988c8d182da945cd9420274f33487157c5636f (patch)
tree32ab1cf9026d6e4a05fae3096a7ae2e38bdf4222 /rerere.h
parentread-tree, merge-recursive: overwrite ignored files by default (diff)
downloadtgif-04988c8d182da945cd9420274f33487157c5636f.tar.xz
unpack-trees: introduce preserve_ignored to unpack_trees_options
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>
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions