diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-11-16 00:49:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-16 00:49:20 -0800 |
| commit | bf31115312aefd36f1571379842eebebf34dcb55 (patch) | |
| tree | 20f326130a1a40f25ac5c82b0adae7854b0b346f | |
| parent | c9d8563c815a6a90bcc15057de288684d7cae5ef (diff) | |
| parent | 4b4e26d21f77d9e90125ca1c8f48592a9cd6f543 (diff) | |
| download | git-bf31115312aefd36f1571379842eebebf34dcb55.tar.gz git-bf31115312aefd36f1571379842eebebf34dcb55.tar.xz | |
Merge branch 'maint'
* maint:
Teach ls-files --with-tree=<tree> to work with options other than -c
builtin-ls-files.c: coding style fix.
| -rw-r--r-- | builtin-ls-files.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index b48327db9..f72eb8547 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -227,6 +227,8 @@ static void show_files(struct dir_struct *dir, const char *prefix) int dtype = ce_to_dtype(ce); if (excluded(dir, ce->name, &dtype) != dir->show_ignored) continue; + if (ce->ce_flags & CE_UPDATE) + continue; err = lstat(ce->name, &st); if (show_deleted && err) show_ce_entry(tag_removed, ce); @@ -329,7 +331,7 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix) if (prefix) { static const char *(matchbuf[2]); matchbuf[0] = prefix; - matchbuf [1] = NULL; + matchbuf[1] = NULL; match = matchbuf; } else match = NULL; |