diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-18 02:40:49 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-18 02:40:49 (GMT) |
| commit | bb52def6dafabbfa07ee51562c9291222df55bd9 (patch) | |
| tree | 206184ba6fb040d27f48f0cad04c1b5aa87a98d9 /builtin | |
| parent | f1afbb063ff86e40caeaee31146f62c7a3c10c57 (diff) | |
| parent | 556895d0c8e95a8c2fb41434a5b9bf453e9367f6 (diff) | |
| download | git-bb52def6dafabbfa07ee51562c9291222df55bd9.zip git-bb52def6dafabbfa07ee51562c9291222df55bd9.tar.gz git-bb52def6dafabbfa07ee51562c9291222df55bd9.tar.bz2 | |
Merge branch 'jj/stash-reset-only-toplevel'
"git stash save" lost local changes to submodules, which has been
corrected.
* jj/stash-reset-only-toplevel:
stash: avoid recursive hard reset on submodules
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/stash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/stash.c b/builtin/stash.c index bb4f6d8..4e80617 100644 --- a/builtin/stash.c +++ b/builtin/stash.c @@ -1392,7 +1392,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; |