undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-ls-files: add --exclude-standard

Browse Source 
This provides a way for scripts to get at the new standard exclude
function.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2007-11-15 02:04:30 -05:00 committed by Junio C Hamano
parent a777e9ca54
commit 8e7b07c8a7
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-ls-files.txt
View File

@ -15,6 +15,7 @@ SYNOPSIS
[-x <pattern>|--exclude=<pattern>] [-x <pattern>|--exclude=<pattern>]
[-X <file>|--exclude-from=<file>] [-X <file>|--exclude-from=<file>]
[--exclude-per-directory=<file>] [--exclude-per-directory=<file>]
[--exclude-standard]
[--error-unmatch] [--with-tree=<tree-ish>] [--error-unmatch] [--with-tree=<tree-ish>]
[--full-name] [--abbrev] [--] [<file>]\* [--full-name] [--abbrev] [--] [<file>]\*
@ -77,6 +78,10 @@ OPTIONS
read additional exclude patterns that apply only to the read additional exclude patterns that apply only to the
directory and its subdirectories in <file>. directory and its subdirectories in <file>.
--exclude-standard::
Add the standard git exclusions: .git/info/exclude, .gitignore
in each directory, and the user's global exclusion file.
--error-unmatch:: --error-unmatch::
If any <file> does not appear in the index, treat this as an If any <file> does not appear in the index, treat this as an
error (return 1). error (return 1).

9
builtin-ls-files.c
View File

@ -387,8 +387,8 @@ static void overlay_tree(const char *tree_name, const char *prefix)
static const char ls_files_usage[] = static const char ls_files_usage[] =
"git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* " "git-ls-files [-z] [-t] [-v] (--[cached|deleted|others|stage|unmerged|killed|modified])* "
"[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] " "[ --ignored ] [--exclude=<pattern>] [--exclude-from=<file>] "
"[ --exclude-per-directory=<filename> ] [--full-name] [--abbrev] " "[ --exclude-per-directory=<filename> ] [--exclude-standard] "
"[--] [<file>]*"; "[--full-name] [--abbrev] [--] [<file>]*";
int cmd_ls_files(int argc, const char **argv, const char *prefix) int cmd_ls_files(int argc, const char **argv, const char *prefix)
{ {
@ -496,6 +496,11 @@ int cmd_ls_files(int argc, const char **argv, const char *prefix)
dir.exclude_per_dir = arg + 24; dir.exclude_per_dir = arg + 24;
continue; continue;
} }
if (!strcmp(arg, "--exclude-standard")) {
exc_given = 1;
setup_standard_excludes(&dir);
continue;
}
if (!strcmp(arg, "--full-name")) { if (!strcmp(arg, "--full-name")) {
prefix_offset = 0; prefix_offset = 0;
continue; continue;

5
git-add--interactive.perl
View File

@ -37,10 +37,7 @@ sub list_untracked {
chomp $_; chomp $_;
$_; $_;
} }
run_cmd_pipe(qw(git ls-files --others run_cmd_pipe(qw(git ls-files --others --exclude-standard --), @_);
--exclude-per-directory=.gitignore),
"--exclude-from=$GIT_DIR/info/exclude",
'--', @_);
} }
my $status_fmt = '%12s %12s %s'; my $status_fmt = '%12s %12s %s';