summaryrefslogtreecommitdiff
path: root/wt-status.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-03-20 21:30:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-03-20 21:30:51 (GMT)
commitde2e3b04cd70a22016561547530f980c66807641 (patch)
treefc842c0e91cff12f3c84f3da0f85042d937ec19e /wt-status.c
parent5645b021177d000bc8b2971aa73b82b62413ee20 (diff)
parent2fb6d6d6dd1033bfe82d6d327ac270f9cf8943cd (diff)
downloadgit-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 'wt-status.c')
-rw-r--r--wt-status.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/wt-status.c b/wt-status.c
index dd87339..929b00f 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -250,10 +250,9 @@ static void wt_status_print_untracked(struct wt_status *s)
memset(&dir, 0, sizeof(dir));
- if (!s->untracked) {
- dir.show_other_directories = 1;
- dir.hide_empty_directories = 1;
- }
+ if (!s->untracked)
+ dir.flags |=
+ DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
setup_standard_excludes(&dir);
read_directory(&dir, ".", "", 0, NULL);