diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:30:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 14:30:51 -0700 |
| commit | de2e3b04cd70a22016561547530f980c66807641 (patch) | |
| tree | fc842c0e91cff12f3c84f3da0f85042d937ec19e /builtin-add.c | |
| parent | 5645b021177d000bc8b2971aa73b82b62413ee20 (diff) | |
| parent | 2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd (diff) | |
| download | git-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-add.c')
| -rw-r--r-- | builtin-add.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-add.c b/builtin-add.c index 7ddb65932d..cb67d2c17e 100644 --- a/builtin-add.c +++ b/builtin-add.c @@ -104,7 +104,7 @@ static void fill_directory(struct dir_struct *dir, const char **pathspec, /* Set up the default git porcelain excludes */ memset(dir, 0, sizeof(*dir)); if (!ignored_too) { - dir->collect_ignored = 1; + dir->flags |= DIR_COLLECT_IGNORED; setup_standard_excludes(dir); } |