git-for-windows/git
1
0
Fork 0
mirror of https://github.com/git-for-windows/git.git synced 2026-03-29 13:57:10 -05:00
Code Issues Packages Projects Releases 335 Wiki Activity

Merge pull request #1354 from dscho/phase-out-show-ignored-directory-gracefully

Browse Source 
Phase out `--show-ignored-directory` gracefully
This commit is contained in:
Johannes Schindelin
2018-06-08 18:38:17 +02:00
parent a6edf291d7 9e967564dd
commit 79ec44e4e5
2 changed files with 161 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/commit.c
View File

@@ -1477,6 +1477,7 @@ int cmd_status(int argc, const char **argv, const char *prefix)
static int no_renames = -1;
static const char *rename_score_arg = (const char *)-1;
static int no_lock_index = 0;
static int show_ignored_directory = 0;
static struct wt_status s;
unsigned int progress_flag = 0;
int fd;
@@ -1515,6 +1516,10 @@ int cmd_status(int argc, const char **argv, const char *prefix)
OPT_CALLBACK_F('M', "find-renames", &rename_score_arg,
N_("n"), N_("detect renames, optionally set similarity index"),
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score),
OPT_BOOL(0, "show-ignored-directory", &show_ignored_directory,
N_("(DEPRECATED: use --ignore=matching instead) Only "
"show directories that match an ignore pattern "
"name.")),
OPT_BOOL(0, "no-lock-index", &no_lock_index,
N_("(DEPRECATED: use `git --no-optional-locks status` "
"instead) Do not lock the index")),
@@ -1540,6 +1545,12 @@ int cmd_status(int argc, const char **argv, const char *prefix)
setenv(GIT_OPTIONAL_LOCKS_ENVIRONMENT, "false", 1);
}
if (show_ignored_directory) {
warning("--show-ignored-directory was deprecated, use "
"--ignored=matching instead");
ignored_arg = "matching";
}
handle_untracked_files_arg(&s);
handle_ignored_arg(&s);