diff options
author | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:57 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-10-13 15:15:57 -0700 |
commit | a7c2daa06d6f7d8fd13a1d72f23741acbaeba522 (patch) | |
tree | b1b0095d267b98188a7ae24ac77934298b665649 /merge-recursive.c | |
parent | 1fdfb774aaaa0ee8acb0a1ec9b601e5a2d2999f1 (diff) | |
parent | 0e29222e0c2f68118cdd3412515539b74433b732 (diff) | |
download | git-a7c2daa06d6f7d8fd13a1d72f23741acbaeba522.tar.gz |
Merge branch 'en/removing-untracked-fixes'
Various fixes in code paths that move untracked files away to make room.
* en/removing-untracked-fixes:
Documentation: call out commands that nuke untracked files/directories
Comment important codepaths regarding nuking untracked files/dirs
unpack-trees: avoid nuking untracked dir in way of locally deleted file
unpack-trees: avoid nuking untracked dir in way of unmerged file
Change unpack_trees' 'reset' flag into an enum
Remove ignored files by default when they are in the way
unpack-trees: make dir an internal-only struct
unpack-trees: introduce preserve_ignored to unpack_trees_options
read-tree, merge-recursive: overwrite ignored files by default
checkout, read-tree: fix leak of unpack_trees_options.dir
t2500: add various tests for nuking untracked files
Diffstat (limited to 'merge-recursive.c')
-rw-r--r-- | merge-recursive.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 5a2d8a60c0..c553751889 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -409,8 +409,11 @@ static int unpack_trees_start(struct merge_options *opt, memset(&opt->priv->unpack_opts, 0, sizeof(opt->priv->unpack_opts)); if (opt->priv->call_depth) opt->priv->unpack_opts.index_only = 1; - else + else { opt->priv->unpack_opts.update = 1; + /* FIXME: should only do this if !overwrite_ignore */ + opt->priv->unpack_opts.preserve_ignored = 0; + } opt->priv->unpack_opts.merge = 1; opt->priv->unpack_opts.head_idx = 2; opt->priv->unpack_opts.fn = threeway_merge; |