rebase: save autostash entry into stash reflog on --quit
In a03b55530a
(merge: teach --autostash option, 2020-04-07), the
--autostash option was introduced for `git merge`. Notably, when
`git merge --quit` is run with an autostash entry present, it is saved
into the stash reflog. This is contrasted with the current behaviour of
`git rebase --quit` where the autostash entry is simply just dropped out
of existence.
Adopt the behaviour of `git merge --quit` in `git rebase --quit` and
save the autostash entry into the stash reflog instead of just deleting
it.
Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:

committed by
Junio C Hamano

parent
d9f15d37f1
commit
9b2df3e8d0
@ -1556,6 +1556,7 @@ int cmd_rebase(int argc, const char **argv, const char *prefix)
|
||||
goto cleanup;
|
||||
}
|
||||
case ACTION_QUIT: {
|
||||
save_autostash(state_dir_path("autostash", &options));
|
||||
if (options.type == REBASE_MERGE) {
|
||||
struct replay_opts replay = REPLAY_OPTS_INIT;
|
||||
|
||||
|
Reference in New Issue
Block a user