Skip to content

Drop deprecated git status --no-lock-index option #2068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2022
Merged

Drop deprecated git status --no-lock-index option #2068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions Documentation/git-status.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,6 @@ ignored, then the directory is not shown, but all contents are shown.
threshold.
See also linkgit:git-diff[1] `--find-renames`.

--no-lock-index::
--lock-index::
(DEPRECATED: use --no-optional-locks instead)
Specifies whether `git status` should try to lock the index and
update it afterwards if any changes were detected. Defaults to
`--lock-index`.

<pathspec>...::
See the 'pathspec' entry in linkgit:gitglossary[7].

Expand Down
10 changes: 0 additions & 10 deletions builtin/commit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1475,7 +1475,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 struct wt_status s;
unsigned int progress_flag = 0;
int fd;
Expand Down Expand Up @@ -1514,9 +1513,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, "no-lock-index", &no_lock_index,
N_("(DEPRECATED: use `git --no-optional-locks status` "
"instead) Do not lock the index")),
OPT_END(),
};

Expand All @@ -1533,12 +1529,6 @@ int cmd_status(int argc, const char **argv, const char *prefix)
finalize_colopts(&s.colopts, -1);
finalize_deferred_config(&s);

if (no_lock_index) {
warning("--no-lock-index is deprecated, use --no-optional-locks"
" instead");
setenv(GIT_OPTIONAL_LOCKS_ENVIRONMENT, "false", 1);
}

handle_untracked_files_arg(&s);
handle_ignored_arg(&s);

Expand Down
11 changes: 0 additions & 11 deletions t/t7508-status.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1646,17 +1646,6 @@ test_expect_success '"Initial commit" should not be noted in commit template' '
test_i18ngrep ! "Initial commit" output
'

test_expect_success '--no-lock-index prevents index update and is deprecated' '
test-tool chmtime =1234567890 .git/index &&
git status --no-lock-index 2>err &&
grep "no-lock-index is deprecated" err &&
test-tool chmtime -v +0 .git/index >out &&
grep ^1234567890 out &&
git status &&
test-tool chmtime -v +0 .git/index >out &&
! grep ^1234567890 out
'

test_expect_success '--no-optional-locks prevents index update' '
test_set_magic_mtime .git/index &&
git --no-optional-locks status &&
Expand Down