global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-01-22 00:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'status-no-lock-index'

Browse Source 
This branch allows third-party tools to call `git status
--no-lock-index` to avoid lock contention with the interactive Git usage
of the actual human user.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2017-11-29 11:35:24 +01:00
parent ccbb2fb0cd 04fe37d3c8
commit 6833dddfc4
3 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/git-status.txt
View File

@@ -130,6 +130,13 @@ ignored, then the directory is not shown, but all contents are shown.
without options are equivalent to 'always' and 'never'
respectively.
--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].

10
builtin/commit.c
View File

@@ -1354,6 +1354,7 @@ static int git_status_config(const char *k, const char *v, void *cb)
int cmd_status(int argc, const char **argv, const char *prefix)
{
static int no_lock_index = 0;
static struct wt_status s;
int fd;
struct object_id oid;
@@ -1385,6 +1386,9 @@ int cmd_status(int argc, const char **argv, const char *prefix)
N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
OPT_COLUMN(0, "column", &s.colopts, N_("list untracked files in columns")),
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(),
};
@@ -1398,6 +1402,12 @@ 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);

11
t/t7508-status.sh
View File

@@ -1671,6 +1671,17 @@ 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-chmtime =1234567890 .git/index &&
git status --no-lock-index 2>err &&
grep "no-lock-index is deprecated" err &&
test-chmtime -v +0 .git/index >out &&
grep ^1234567890 out &&
git status &&
test-chmtime -v +0 .git/index >out &&
! grep ^1234567890 out
'
test_expect_success '--no-optional-locks prevents index update' '
test-chmtime =1234567890 .git/index &&
git --no-optional-locks status &&