diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-20 21:30:51 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-20 21:30:51 (GMT) |
| commit | de2e3b04cd70a22016561547530f980c66807641 (patch) | |
| tree | fc842c0e91cff12f3c84f3da0f85042d937ec19e /builtin-clean.c | |
| parent | 5645b021177d000bc8b2971aa73b82b62413ee20 (diff) | |
| parent | 2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd (diff) | |
| download | git-de2e3b04cd70a22016561547530f980c66807641.zip git-de2e3b04cd70a22016561547530f980c66807641.tar.gz git-de2e3b04cd70a22016561547530f980c66807641.tar.bz2 | |
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-clean.c')
| -rw-r--r-- | builtin-clean.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-clean.c b/builtin-clean.c index f78c2fb..c5ad33d 100644 --- a/builtin-clean.c +++ b/builtin-clean.c @@ -60,7 +60,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) memset(&dir, 0, sizeof(dir)); if (ignored_only) - dir.show_ignored = 1; + dir.flags |= DIR_SHOW_IGNORED; if (ignored && ignored_only) die("-x and -X cannot be used together"); @@ -69,7 +69,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) die("clean.requireForce%s set and -n or -f not given; " "refusing to clean", config_set ? "" : " not"); - dir.show_other_directories = 1; + dir.flags |= DIR_SHOW_OTHER_DIRECTORIES; if (!ignored) setup_standard_excludes(&dir); |