Skip to content

Commit 18ab665

Browse files
committed
fixup! status: reinstate --show-ignored-directory as a deprecated option
We said we would remove --show-ignored-directory in v2.16.0 or v2.17.0, but v2.36.1 is now the current version and we still have not removed it. Let's do it now. We had to wait for a while because some users were still on Visual Studio 2017 (which used that option until a certain stage). But then, users who upgrade Git will also upgrade Visual Studio, or so one would hope, therefore they should not be affected by this change. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent e7ec230 commit 18ab665

File tree

2 files changed

+0
-159
lines changed

2 files changed

+0
-159
lines changed

builtin/commit.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1476,7 +1476,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
14761476
static int no_renames = -1;
14771477
static const char *rename_score_arg = (const char *)-1;
14781478
static int no_lock_index = 0;
1479-
static int show_ignored_directory = 0;
14801479
static struct wt_status s;
14811480
unsigned int progress_flag = 0;
14821481
int fd;
@@ -1515,10 +1514,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
15151514
OPT_CALLBACK_F('M', "find-renames", &rename_score_arg,
15161515
N_("n"), N_("detect renames, optionally set similarity index"),
15171516
PARSE_OPT_OPTARG | PARSE_OPT_NONEG, opt_parse_rename_score),
1518-
OPT_BOOL(0, "show-ignored-directory", &show_ignored_directory,
1519-
N_("(DEPRECATED: use --ignore=matching instead) Only "
1520-
"show directories that match an ignore pattern "
1521-
"name.")),
15221517
OPT_BOOL(0, "no-lock-index", &no_lock_index,
15231518
N_("(DEPRECATED: use `git --no-optional-locks status` "
15241519
"instead) Do not lock the index")),
@@ -1544,12 +1539,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
15441539
setenv(GIT_OPTIONAL_LOCKS_ENVIRONMENT, "false", 1);
15451540
}
15461541

1547-
if (show_ignored_directory) {
1548-
warning("--show-ignored-directory was deprecated, use "
1549-
"--ignored=matching instead");
1550-
ignored_arg = "matching";
1551-
}
1552-
15531542
handle_untracked_files_arg(&s);
15541543
handle_ignored_arg(&s);
15551544

t/t7522-status-show-ignored-directory.sh

Lines changed: 0 additions & 148 deletions
This file was deleted.

0 commit comments

Comments
 (0)