From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 28 Nov 2011 18:41:43 +0000 (-0800)
Subject: Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
X-Git-Tag: v1.7.9-rc0~68^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f44054c82f4199ccff14f472e4fd7904b0db8ff5;p=git.git

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
---

f44054c82f4199ccff14f472e4fd7904b0db8ff5
diff --cc builtin/checkout.c
index 2a8077242,2b90e6b5e..51840b978
--- 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);