# [PATCH] rebase -i: handle "Nothing to do" case with autostash 5 messages from 2014-05-19 to 2014-05-20. Participants: Ramkumar Ramachandra, Eric Sunshine, Matthieu Moy, Junio C Hamano. Thread: https://gitlist.dev/t/36704 ## Ramkumar Ramachandra, 2014-05-19 22:05 Subject: [PATCH] rebase -i: handle "Nothing to do" case with autostash Message-ID: <1400537120-9995-1-git-send-email-artagnon@gmail.com> URL: https://gitlist.dev/e/1400537120-9995-1-git-send-email-artagnon%40gmail.com ``` 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 Signed-off-by: Ramkumar Ramachandra --- Thanks to Karen for reporting this. I chose 2 arbitrarily. Let me know if you have a rationale for other return values. git-rebase--interactive.sh | 4 ++-- git-rebase.sh | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 6ec9d3c..f267d8b 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -1049,14 +1049,14 @@ fi has_action "$todo" || - die_abort "Nothing to do" + return 2 cp "$todo" "$todo".backup git_sequence_editor "$todo" || die_abort "Could not execute editor" has_action "$todo" || - die_abort "Nothing to do" + return 2 expand_todo_ids diff --git a/git-rebase.sh b/git-rebase.sh index 4543815..47ca3b9 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -155,7 +155,7 @@ move_to_original_branch () { esac } -finish_rebase () { +apply_autostash () { if test -f "$state_dir/autostash" then stash_sha1=$(cat "$state_dir/autostash") @@ -171,6 +171,10 @@ You can run "git stash pop" or "git stash drop" at any time. ' fi fi +} + +finish_rebase () { + apply_autostash && git gc --auto && rm -rf "$state_dir" } @@ -186,6 +190,11 @@ run_specific_rebase () { if test $ret -eq 0 then finish_rebase + elif test $ret -eq 2 # special exit status for rebase -i + then + apply_autostash && + rm -rf "$state_dir" && + die "Nothing to do" fi exit $ret } -- 2.0.0.rc2.20.gfc2568d.dirty ``` ## Matthieu Moy, 2014-05-20 06:55 Subject: [PATCH] rebase -i: test "Nothing to do" case with autostash Message-ID: <1400568913-1340-1-git-send-email-Matthieu.Moy@imag.fr> URL: https://gitlist.dev/e/1400568913-1340-1-git-send-email-Matthieu.Moy%40imag.fr In-Reply-To: <1400537120-9995-1-git-send-email-artagnon@gmail.com> ``` Signed-off-by: Matthieu Moy --- Ram's patch lacks a test. Here it is. Fails without Ram's patch, and passes with it. Can be squashed into Ram's patch. t/t3420-rebase-autostash.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 90eb264..c2e9a4c 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -167,4 +167,21 @@ testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge +test_expect_success 'Abort rebase with --autostash' ' + git log && + echo new-content >file0 && + ( + write_script abort-editor.sh <<-\EOF && + echo > "$1" + EOF + GIT_EDITOR=\"$(pwd)/abort-editor.sh\" && + export GIT_EDITOR && + test_must_fail git rebase -i --autostash HEAD^ && + rm -f abort-editor.sh + ) && + git status && + echo new-content >expected && + test_cmp expected file0 +' + test_done -- 2.0.0.rc3.499.gd6dc9ad ``` ## Eric Sunshine, 2014-05-20 07:22 Subject: Re: [PATCH] rebase -i: test "Nothing to do" case with autostash Message-ID: URL: https://gitlist.dev/e/CAPig%2BcSWrc-W%2B9CZQ9vF-E3xcLY3OFoRMpHLb3K8Vsx3iz1Mjw%40mail.gmail.com In-Reply-To: <1400568913-1340-1-git-send-email-Matthieu.Moy@imag.fr> ``` On Tue, May 20, 2014 at 2:55 AM, Matthieu Moy wrote: > Signed-off-by: Matthieu Moy > --- > Ram's patch lacks a test. Here it is. Fails without Ram's patch, and > passes with it. > > Can be squashed into Ram's patch. > > t/t3420-rebase-autostash.sh | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh > index 90eb264..c2e9a4c 100755 > --- a/t/t3420-rebase-autostash.sh > +++ b/t/t3420-rebase-autostash.sh > @@ -167,4 +167,21 @@ testrebase "" .git/rebase-apply > testrebase " --merge" .git/rebase-merge > testrebase " --interactive" .git/rebase-merge > > +test_expect_success 'Abort rebase with --autostash' ' > + git log && > + echo new-content >file0 && > + ( > + write_script abort-editor.sh <<-\EOF && > + echo > "$1" > + EOF > + GIT_EDITOR=\"$(pwd)/abort-editor.sh\" && > + export GIT_EDITOR && Simpler (replace above two lines): test_set_editor "$(pwd)/abort-editor.sh" && > + test_must_fail git rebase -i --autostash HEAD^ && > + rm -f abort-editor.sh > + ) && > + git status && > + echo new-content >expected && > + test_cmp expected file0 > +' > + > test_done > -- > 2.0.0.rc3.499.gd6dc9ad ``` ## Matthieu Moy, 2014-05-20 07:49 Subject: [PATCH v2] rebase -i: test "Nothing to do" case with autostash Message-ID: <1400572171-28372-1-git-send-email-Matthieu.Moy@imag.fr> URL: https://gitlist.dev/e/1400572171-28372-1-git-send-email-Matthieu.Moy%40imag.fr In-Reply-To: ``` Signed-off-by: Matthieu Moy --- Eric Sunshine writes: > Simpler (replace above two lines): > > test_set_editor "$(pwd)/abort-editor.sh" && Indeed. And I had debug statements left. Hopefully, this after-coffee-v2 will be clear enough and correct ;-). t/t3420-rebase-autostash.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/t/t3420-rebase-autostash.sh b/t/t3420-rebase-autostash.sh index 90eb264..ff1e2dc 100755 --- a/t/t3420-rebase-autostash.sh +++ b/t/t3420-rebase-autostash.sh @@ -167,4 +167,19 @@ testrebase "" .git/rebase-apply testrebase " --merge" .git/rebase-merge testrebase " --interactive" .git/rebase-merge +test_expect_success 'abort rebase -i with --autostash' ' + test_when_finished "git reset --hard" && + echo uncommited-content >file0 && + ( + write_script abort-editor.sh <<-\EOF && + echo > "$1" + EOF + test_set_editor "$(pwd)/abort-editor.sh" && + test_must_fail git rebase -i --autostash HEAD^ && + rm -f abort-editor.sh + ) && + echo uncommited-content >expected && + test_cmp expected file0 +' + test_done -- 2.0.0.rc3.499.gd6dc9ad ``` ## Junio C Hamano, 2014-05-20 18:34 Subject: Re: [PATCH v2] rebase -i: test "Nothing to do" case with autostash Message-ID: URL: https://gitlist.dev/e/xmqqfvk4z4d2.fsf%40gitster.dls.corp.google.com In-Reply-To: <1400572171-28372-1-git-send-email-Matthieu.Moy@imag.fr> ``` Matthieu Moy writes: > Signed-off-by: Matthieu Moy > --- > Eric Sunshine writes: > >> Simpler (replace above two lines): >> >> test_set_editor "$(pwd)/abort-editor.sh" && > > Indeed. > > And I had debug statements left. > > Hopefully, this after-coffee-v2 will be clear enough and correct ;-). Thanks, will queue on top of Ram's fix. ```