stash: avoid recursive hard reset on submodules
git stash push does not recursively stash submodules, but if submodule.recurse is set, it may recursively reset --hard them. Having only the destructive action recurse is likely to be surprising behaviour, and unlikely to be desirable, so the easiest fix should be to ensure that the call to git reset --hard never recurses into submodules. This matches the behavior of check_changes_tracked_files, which ignores submodules. Signed-off-by: Jakob Jarmar <jakob@jarmar.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
5fa0f5238b
commit
556895d0c8
@ -1383,7 +1383,7 @@ static int do_push_stash(const struct pathspec *ps, const char *stash_msg, int q
|
||||
struct child_process cp = CHILD_PROCESS_INIT;
|
||||
cp.git_cmd = 1;
|
||||
argv_array_pushl(&cp.args, "reset", "--hard", "-q",
|
||||
NULL);
|
||||
"--no-recurse-submodules", NULL);
|
||||
if (run_command(&cp)) {
|
||||
ret = -1;
|
||||
goto done;
|
||||
|
Reference in New Issue
Block a user