From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 14 Dec 2011 05:47:08 +0000 (-0800)
Subject: Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
X-Git-Tag: v1.7.7.5~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b425656a469722d9c45b7c88e0e01a9cd8c0fd3;p=git.git

Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7

* nd/maint-ignore-exclude:
  checkout,merge: loosen overwriting untracked file check based on info/exclude
---

3b425656a469722d9c45b7c88e0e01a9cd8c0fd3
diff --cc builtin/checkout.c
index a7a493cec,2b90e6b5e..7ea9f29aa
--- a/builtin/checkout.c
+++ b/builtin/checkout.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);