Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (21:47 -0800)
* nd/maint-ignore-exclude:
  checkout,merge: loosen overwriting untracked file check based on info/exclude

1  2 
builtin/checkout.c
builtin/merge.c

@@@ -411,10 -401,10 +411,10 @@@ static int merge_working_tree(struct ch
                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);
 +                                         EMPTY_TREE_SHA1_BIN);
                init_tree_desc(&trees[0], tree->buffer, tree->size);
                tree = parse_tree_indirect(new->commit->object.sha1);
                init_tree_desc(&trees[1], tree->buffer, tree->size);
diff --cc builtin/merge.c
Simple merge