summaryrefslogtreecommitdiff
path: root/compat
diff options
context:
space:
mode:
authorLibravatar Ramkumar Ramachandra <artagnon@gmail.com>2014-05-19 18:05:20 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-05-19 15:36:24 -0700
commite4244eb3957d478ca05b42d8b56aadb9ab2bc7ae (patch)
tree67a4bb7b8c1b932542396f2501a7c32809ca78b9 /compat
parentgit-rebase: fix typo (diff)
downloadtgif-e4244eb3957d478ca05b42d8b56aadb9ab2bc7ae.tar.xz
rebase -i: handle "Nothing to do" case with autostash
When a user invokes $ git rebase -i @~3 with dirty files and rebase.autostash turned on, and exits the $EDITOR with an empty buffer, the autostash fails to apply. Although the primary focus of rr/rebase-autostash was to get the git-rebase--backend.sh scripts to return control to git-rebase.sh, it missed this case in git-rebase--interactive.sh. Since this case is unlike the other cases which return control for housekeeping, assign it a special return status and handle that return value explicitly in git-rebase.sh. Reported-by: Karen Etheridge <ether@cpan.org> Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat')
0 files changed, 0 insertions, 0 deletions