Skip to content

Commit 57b5a73

Browse files
J WymanGit for Windows Build Agent
authored andcommitted
Carry non-locking status value in the environment.
If the user has specified '--no-lock-index' when calling git-status, it only seems reasonable that the user intends that option to be carried through to any child forks/procs as well. Currently, the '--no-lock-status' call is lost when submodules are checked. This change places the desired option into the environment, which is in turn passed down to all subsequent children. With cmd_status checking for '--no-lock--status' first from args then from environment, we're able to keep the option set in all children. Signed-off-by: J Wyman <[email protected]>
1 parent 3d5b1a3 commit 57b5a73

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

builtin/commit.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,6 +1378,11 @@ int cmd_status(int argc, const char **argv, const char *prefix)
13781378
finalize_colopts(&s.colopts, -1);
13791379
finalize_deferred_config(&s);
13801380

1381+
if (no_lock_index)
1382+
setenv("GIT_LOCK_INDEX", "false", 1);
1383+
else if (!git_parse_maybe_bool(getenv("GIT_LOCK_INDEX")))
1384+
no_lock_index = 1;
1385+
13811386
handle_untracked_files_arg(&s);
13821387
if (show_ignored_in_status)
13831388
s.show_ignored_files = 1;

0 commit comments

Comments
 (0)