diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-13 21:47:08 -0800 |
| commit | 3b425656a469722d9c45b7c88e0e01a9cd8c0fd3 (patch) | |
| tree | 189b98866ea410ba2a94a578b4c7261b4f52e434 /builtin | |
| parent | 7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b (diff) | |
| parent | fc001b526c42e5fb776340136a2fb247e391a61b (diff) | |
| download | git-3b425656a469722d9c45b7c88e0e01a9cd8c0fd3.tar.gz | |
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
Diffstat (limited to 'builtin')
| -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 a7a493cecf..7ea9f29aa6 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 581f494aee..b22a842238 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -759,7 +759,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; |