From 4bfee30a98783f7987c395e6006a2a6717344c04 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 5 Jun 2008 10:31:19 +0200 Subject: Add an optional argument to commit/status -u|--untracked-files option This lets you specify how you want untracked files to be listed. The possible options are: normal - Show untracked files and directories all - Show all untracked files The 'all' mode is used, if the mode is not specified. Signed-off-by: Marius Storm-Olsen --- Documentation/git-commit.txt | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'Documentation/git-commit.txt') diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 02d4baab6d..e600e14be5 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -8,7 +8,7 @@ git-commit - Record changes to the repository SYNOPSIS -------- [verse] -'git-commit' [-a | --interactive] [-s] [-v] [-u] +'git-commit' [-a | --interactive] [-s] [-v] [-u[]] [(-c | -C) | -F | -m | --amend] [--allow-empty] [--no-verify] [-e] [--author ] [--cleanup=] [--] [[-i | -o ]...] @@ -150,12 +150,16 @@ but can be used to amend a merge commit. the last commit without committing changes that have already been staged. --u|--untracked-files:: - Show all untracked files, also those in uninteresting - directories, in the "Untracked files:" section of commit - message template. Without this option only its name and - a trailing slash are displayed for each untracked - directory. +-u[]|--untracked-files[=]:: + Show untracked files (Default: 'all'). ++ +The mode parameter is optional, and is used to specify +the handling of untracked files. The possible options are: ++ +-- + - 'normal' - Shows untracked files and directories + - 'all' - Also shows individual files in untracked directories. +-- -v|--verbose:: Show unified diff between the HEAD commit and what -- cgit v1.3 From 6c2ce048bbfc6fbc2bdd86a3e586cb8881eb2dc2 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 5 Jun 2008 14:22:56 +0200 Subject: Add argument 'no' commit/status option -u|--untracked-files This new argument teaches Git to not look for any untracked files, saving cycles on slow file systems, or large repos. Signed-off-by: Marius Storm-Olsen --- Documentation/git-commit.txt | 1 + builtin-commit.c | 4 +++- t/t7502-status.sh | 25 ++++++++++++++++++++++--- wt-status.c | 7 ++++++- wt-status.h | 3 ++- 5 files changed, 34 insertions(+), 6 deletions(-) (limited to 'Documentation/git-commit.txt') diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index e600e14be5..a6f41f3663 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -157,6 +157,7 @@ The mode parameter is optional, and is used to specify the handling of untracked files. The possible options are: + -- + - 'no' - Show no untracked files - 'normal' - Shows untracked files and directories - 'all' - Also shows individual files in untracked directories. -- diff --git a/builtin-commit.c b/builtin-commit.c index 446a1086fd..0a70808280 100644 --- a/builtin-commit.c +++ b/builtin-commit.c @@ -103,7 +103,7 @@ static struct option builtin_commit_options[] = { OPT_BOOLEAN('o', "only", &only, "commit only specified files"), OPT_BOOLEAN('n', "no-verify", &no_verify, "bypass pre-commit hook"), OPT_BOOLEAN(0, "amend", &amend, "amend previous commit"), - { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, + { OPTION_STRING, 'u', "untracked-files", &untracked_files_arg, "mode", "show untracked files, optional modes: all, normal, no. (Default: all)", PARSE_OPT_OPTARG, NULL, (intptr_t)"all" }, OPT_BOOLEAN(0, "allow-empty", &allow_empty, "ok to record an empty change"), OPT_STRING(0, "cleanup", &cleanup_arg, "default", "how to strip spaces and #comments from message"), @@ -798,6 +798,8 @@ static int parse_and_validate_options(int argc, const char *argv[], if (!untracked_files_arg) ; /* default already initialized */ + else if (!strcmp(untracked_files_arg, "no")) + show_untracked_files = SHOW_NO_UNTRACKED_FILES; else if (!strcmp(untracked_files_arg, "normal")) show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; else if (!strcmp(untracked_files_arg, "all")) diff --git a/t/t7502-status.sh b/t/t7502-status.sh index 0d24e259fb..d84bda1dda 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -67,6 +67,28 @@ test_expect_success 'status (2)' ' ' +cat >expect <..." to unstage) +# +# new file: dir2/added +# +# Changed but not updated: +# (use "git add ..." to update what will be committed) +# +# modified: dir1/modified +# +# Untracked files not listed (use -u option to show untracked files) +EOF +test_expect_success 'status -uno' ' + mkdir dir3 && + : > dir3/untracked1 && + : > dir3/untracked2 && + git status -uno >output && + test_cmp expect output +' + cat >expect <expect < dir3/untracked1 && - : > dir3/untracked2 && git status -unormal >output && test_cmp expect output ' diff --git a/wt-status.c b/wt-status.c index 25d998513e..23017e4d46 100644 --- a/wt-status.c +++ b/wt-status.c @@ -348,7 +348,10 @@ void wt_status_print(struct wt_status *s) wt_status_print_changed(s); if (wt_status_submodule_summary) wt_status_print_submodule_summary(s); - wt_status_print_untracked(s); + if (show_untracked_files) + wt_status_print_untracked(s); + else if (s->commitable) + fprintf(s->fp, "# Untracked files not listed (use -u option to show untracked files)\n"); if (s->verbose && !s->is_initial) wt_status_print_verbose(s); @@ -363,6 +366,8 @@ void wt_status_print(struct wt_status *s) printf("nothing added to commit but untracked files present (use \"git add\" to track)\n"); else if (s->is_initial) printf("nothing to commit (create/copy files and use \"git add\" to track)\n"); + else if (!show_untracked_files) + printf("nothing to commit (use -u to show untracked files)\n"); else printf("nothing to commit (working directory clean)\n"); } diff --git a/wt-status.h b/wt-status.h index 54f756de2b..78add09bd6 100644 --- a/wt-status.h +++ b/wt-status.h @@ -12,7 +12,8 @@ enum color_wt_status { }; enum untracked_status_type { - SHOW_NORMAL_UNTRACKED_FILES = 1, + SHOW_NO_UNTRACKED_FILES, + SHOW_NORMAL_UNTRACKED_FILES, SHOW_ALL_UNTRACKED_FILES }; extern enum untracked_status_type show_untracked_files; -- cgit v1.3 From d6293d1f2cadcdf45f8ada7847a32b51fa5bf0a6 Mon Sep 17 00:00:00 2001 From: Marius Storm-Olsen Date: Thu, 5 Jun 2008 14:47:50 +0200 Subject: Add configuration option for default untracked files mode By default, the untracked files mode for commit/status is 'normal' Signed-off-by: Marius Storm-Olsen --- Documentation/config.txt | 19 +++++++++++++++++++ Documentation/git-commit.txt | 4 ++++ t/t7502-status.sh | 18 ++++++++++++++++++ wt-status.c | 13 +++++++++++++ 4 files changed, 54 insertions(+) (limited to 'Documentation/git-commit.txt') diff --git a/Documentation/config.txt b/Documentation/config.txt index 5331b450ea..1e09a57c8c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1013,6 +1013,25 @@ status.relativePaths:: relative to the repository root (this was the default for git prior to v1.5.4). +status.showUntrackedFiles:: + By default, linkgit:git-status[1] and linkgit:git-commit[1] show + files which are not currently tracked by Git. Directories which + contain only untracked files, are shown with the directory name + only. Showing untracked files means that Git needs to lstat() all + all the files in the whole repository, which might be slow on some + systems. So, this variable controls how the commands displays + the untracked files. Possible values are: ++ +-- + - 'no' - Show no untracked files + - 'normal' - Shows untracked files and directories + - 'all' - Shows also individual files in untracked directories. +-- ++ +If this variable is not specified, it defaults to 'normal'. +This variable can be overridden with the -u|--untracked-files option +of linkgit:git-status[1] and linkgit:git-commit[1]. + tar.umask:: This variable can be used to restrict the permission bits of tar archive entries. The default is 0002, which turns off the diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index a6f41f3663..2e5ea22a40 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -161,6 +161,10 @@ the handling of untracked files. The possible options are: - 'normal' - Shows untracked files and directories - 'all' - Also shows individual files in untracked directories. -- ++ +See linkgit:git-config[1] for configuration variable +used to change the default for when the option is not +specified. -v|--verbose:: Show unified diff between the HEAD commit and what diff --git a/t/t7502-status.sh b/t/t7502-status.sh index d84bda1dda..38a48b57c7 100755 --- a/t/t7502-status.sh +++ b/t/t7502-status.sh @@ -89,6 +89,12 @@ test_expect_success 'status -uno' ' test_cmp expect output ' +test_expect_success 'status (status.showUntrackedFiles no)' ' + git config status.showuntrackedfiles no + git status >output && + test_cmp expect output +' + cat >expect <output && + test_cmp expect output +' + cat >expect <expect <output && + test_cmp expect output +' +test_expect_success 'status (status.showUntrackedFiles all)' ' + git config status.showuntrackedfiles all + git status >output && rm -rf dir3 && + git config --unset status.showuntrackedfiles && test_cmp expect output ' diff --git a/wt-status.c b/wt-status.c index 23017e4d46..28c9e637e3 100644 --- a/wt-status.c +++ b/wt-status.c @@ -397,5 +397,18 @@ int git_status_config(const char *k, const char *v, void *cb) wt_status_relative_paths = git_config_bool(k, v); return 0; } + if (!strcmp(k, "status.showuntrackedfiles")) { + if (!v) + return config_error_nonbool(v); + else if (!strcmp(v, "no")) + show_untracked_files = SHOW_NO_UNTRACKED_FILES; + else if (!strcmp(v, "normal")) + show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES; + else if (!strcmp(v, "all")) + show_untracked_files = SHOW_ALL_UNTRACKED_FILES; + else + return error("Invalid untracked files mode '%s'", v); + return 0; + } return git_color_default_config(k, v, cb); } -- cgit v1.3