[PATCH] Unify the use of standard set of exclude files
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 15, 2007, 06:38 UTC
- Message-ID
- <7v4pfo813i.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <7vsl39l0b7.fsf@gitster.siamese.dyndns.org>
Junio C Hamano <gitster@pobox.com> writes:
Show 5 quoted lines
> We probably could change git-ls-files to use the standard set > when no excludes are specified from the command line, or > something like that, but this will be a change in semantics that > would affect the scripts in a subtle way. I am somewhat > reluctant to make such a change.
So here it is.
This teaches "git ls-files" to read the standard set of exclude files when no exclude patterns nor files is given from the command line. We used to error out in such a case.
Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
builtin-ls-files.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/builtin-ls-files.c b/builtin-ls-files.c index e0b856f..50dcb89 100644 --- a/builtin-ls-files.c +++ b/builtin-ls-files.c @@ -542,11 +542,8 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix) ps_matched = xcalloc(1, num); } - if (dir.show_ignored && !exc_given) { - fprintf(stderr, "%s: --ignored needs some exclude pattern\n", - argv[0]); - exit(1); - } + if (dir.show_ignored && !exc_given) + setup_standard_excludes(&dir); /* With no flags, we default to showing the cached files */ if (!(show_stage | show_deleted | show_others | show_unmerged |