mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude
This commit is contained in:
commit
f44054c82f
|
@ -411,7 +411,7 @@ static int merge_working_tree(struct checkout_opts *opts,
|
|||
topts.fn = twoway_merge;
|
||||
topts.dir = xcalloc(1, sizeof(*topts.dir));
|
||||
topts.dir->flags |= DIR_SHOW_IGNORED;
|
||||
topts.dir->exclude_per_dir = ".gitignore";
|
||||
setup_standard_excludes(topts.dir);
|
||||
tree = parse_tree_indirect(old->commit ?
|
||||
old->commit->object.sha1 :
|
||||
EMPTY_TREE_SHA1_BIN);
|
||||
|
|
|
@ -775,7 +775,7 @@ int checkout_fast_forward(const unsigned char *head, const unsigned char *remote
|
|||
memset(&t, 0, sizeof(t));
|
||||
memset(&dir, 0, sizeof(dir));
|
||||
dir.flags |= DIR_SHOW_IGNORED;
|
||||
dir.exclude_per_dir = ".gitignore";
|
||||
setup_standard_excludes(&dir);
|
||||
opts.dir = &dir;
|
||||
|
||||
opts.head_idx = 1;
|
||||
|
|
Loading…
Reference in a new issue