checkout,merge: loosen overwriting untracked file check based on info/exclude

[git.git] / builtin / checkout.c

diff --git a/builtin/checkout.c b/builtin/checkout.c
index 560eae17159290c5adcefd2e2e2da5825ac6b75d..2b90e6b5e21dc64132e68c66e4f7430c49724441 100644 (file)
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -401,7 +401,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 :
                                           (unsigned char *)EMPTY_TREE_SHA1_BIN);