Skip to content

Commit

Permalink
Merge pull request #2067 from dscho/drop-deprecated-status-option
Browse files Browse the repository at this point in the history
Drop deprecated `git status --show-ignored-directory` option
  • Loading branch information
dscho committed May 16, 2022
2 parents e2ff68a + 18ab665 commit c6b0c5f
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 161 deletions.
11 changes: 0 additions & 11 deletions builtin/commit.c
Original file line number Diff line number Diff line change
Expand Up @@ -1476,7 +1476,6 @@ 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;
Expand Down Expand Up @@ -1515,10 +1514,6 @@ 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")),
Expand All @@ -1544,12 +1539,6 @@ 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);

Expand Down
150 changes: 0 additions & 150 deletions t/t7522-status-show-ignored-directory.sh

This file was deleted.

0 comments on commit c6b0c5f

Please sign in to comment.