diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:25:12 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-05 23:25:12 (GMT) |
| commit | 9ef569791f967c1559b498d8f77a2c42a14be2ed (patch) | |
| tree | afd2b29be852150fd4f74d57e257ab47729ca86c | |
| parent | ce8781e8ab66fb90fb7baf8d953a4582a06571a7 (diff) | |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b (diff) | |
| download | git-9ef569791f967c1559b498d8f77a2c42a14be2ed.zip git-9ef569791f967c1559b498d8f77a2c42a14be2ed.tar.gz git-9ef569791f967c1559b498d8f77a2c42a14be2ed.tar.bz2 | |
Merge branch 'nd/maint-ignore-exclude'
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude
| -rw-r--r-- | builtin/checkout.c | 2 | ||||
| -rw-r--r-- | builtin/merge.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/builtin/checkout.c b/builtin/checkout.c index 2a80772..51840b9 100644 --- a/builtin/checkout.c +++ b/builtin/checkout.c @@ -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); diff --git a/builtin/merge.c b/builtin/merge.c index 1712b93..8a7bebd 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -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; |