summaryrefslogtreecommitdiff
path: root/builtin-checkout.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-20 14:30:51 -0700
committerJunio C Hamano <gitster@pobox.com>2009-03-20 14:30:51 -0700
commitde2e3b04cd70a22016561547530f980c66807641 (patch)
treefc842c0e91cff12f3c84f3da0f85042d937ec19e /builtin-checkout.c
parent5645b021177d000bc8b2971aa73b82b62413ee20 (diff)
parent2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd (diff)
downloadgit-de2e3b04cd70a22016561547530f980c66807641.tar.gz
Merge branch 'mv/parseopt-ls-files'
* mv/parseopt-ls-files: ls-files: fix broken --no-empty-directory t3000: use test_cmp instead of diff parse-opt: migrate builtin-ls-files. Turn the flags in struct dir_struct into a single variable Conflicts: builtin-ls-files.c t/t3000-ls-files-others.sh
Diffstat (limited to 'builtin-checkout.c')
-rw-r--r--builtin-checkout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-checkout.c b/builtin-checkout.c
index c315f63398..9fdfc58d1a 100644
--- a/builtin-checkout.c
+++ b/builtin-checkout.c
@@ -407,7 +407,7 @@ static int merge_working_tree(struct checkout_opts *opts,
topts.verbose_update = !opts->quiet;
topts.fn = twoway_merge;
topts.dir = xcalloc(1, sizeof(*topts.dir));
- topts.dir->show_ignored = 1;
+ topts.dir->flags |= DIR_SHOW_IGNORED;
topts.dir->exclude_per_dir = ".gitignore";
tree = parse_tree_indirect(old->commit->object.sha1);
init_tree_desc(&trees[0], tree->buffer, tree->size);