Re: Bug? git rebase -i --autostash fails to restore working files
On 28/07/16 14:02, Remi Galan Alfonso wrote: > Hi Phillip, > > Phillip Wood writes: >> When running ‘git rebase -i --autostash’ if the editor fails then the >> rebase fails but stash is not applied so the working files are not >> restored. Running ‘git rebase --abort’ replies that there’s no rebase >> in progress. If you notice what’s happened it’s not a problem if you >> know to do ‘git stash apply ’ but it’s confusing as >> normally the stash would be automatically applied. This happened to me >> when I messed up my editor configuration but you can reproduce it with >> >> $ GIT_SEQUENCE_EDITOR=false git rebase -i --autostash HEAD^^ >> Created autostash: ff960d4 >> HEAD is now at f1b8af7 [git] Turn on rebase.missingCommitsCheck > > [I'm happy to see rebase.missingCommitsCheck being used.] > >> Could not execute editor >> >> $ git rebase --abort >> No rebase in progress? > > I remembered having read something about it recently and a quick > search confirmed it. It was corrected in commit 33ba9c6 (29/06/2016, > rebase -i: restore autostash on abort) that recently graduated to > master (on 19/07/2016 if I read the various "What's cooking" > correctly). So you will need to build git from source to have this > corrected. Hi Rémi Thanks for the reply, it's good to know it's been fixed. Best Wishes Phillip -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: Bug? git rebase -i --autostash fails to restore working files
Hi Phillip, Phillip Wood writes: > When running ‘git rebase -i --autostash’ if the editor fails then the > rebase fails but stash is not applied so the working files are not > restored. Running ‘git rebase --abort’ replies that there’s no rebase > in progress. If you notice what’s happened it’s not a problem if you > know to do ‘git stash apply ’ but it’s confusing as > normally the stash would be automatically applied. This happened to me > when I messed up my editor configuration but you can reproduce it with > > $ GIT_SEQUENCE_EDITOR=false git rebase -i --autostash HEAD^^ > Created autostash: ff960d4 > HEAD is now at f1b8af7 [git] Turn on rebase.missingCommitsCheck [I'm happy to see rebase.missingCommitsCheck being used.] > Could not execute editor > > $ git rebase --abort > No rebase in progress? I remembered having read something about it recently and a quick search confirmed it. It was corrected in commit 33ba9c6 (29/06/2016, rebase -i: restore autostash on abort) that recently graduated to master (on 19/07/2016 if I read the various "What's cooking" correctly). So you will need to build git from source to have this corrected. > Best Wishes > > Phillip Thanks, Rémi -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Bug? git rebase -i --autostash fails to restore working files
When running ‘git rebase -i --autostash’ if the editor fails then the rebase fails but stash is not applied so the working files are not restored. Running ‘git rebase --abort’ replies that there’s no rebase in progress. If you notice what’s happened it’s not a problem if you know to do ‘git stash apply ’ but it’s confusing as normally the stash would be automatically applied. This happened to me when I messed up my editor configuration but you can reproduce it with $ GIT_SEQUENCE_EDITOR=false git rebase -i --autostash HEAD^^ Created autostash: ff960d4 HEAD is now at f1b8af7 [git] Turn on rebase.missingCommitsCheck Could not execute editor $ git rebase --abort No rebase in progress? Best Wishes Phillip -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
