git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: Regression in rebase-in-C with rebase.autoStash=true

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Nov 7, 2018, 13:50 UTC
Message-ID
<nycvar.QRO.7.76.6.1811071436290.39@tvgsbejvaqbjf.bet>
In-Reply-To
<878t2671dc.fsf@evledraar.gmail.com>
Hi Ævar,
On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:
Show 34 quoted lines
> 
> On Tue, Oct 23 2018, Johannes Schindelin via GitGitGadget wrote:
> 
> > Johannes Schindelin (2):
> >   rebase --autostash: demonstrate a problem with dirty submodules
> >   rebase --autostash: fix issue with dirty submodules
> >
> >  builtin/rebase.c            |  2 +-
> >  t/t3420-rebase-autostash.sh | 10 ++++++++++
> >  2 files changed, 11 insertions(+), 1 deletion(-)
> 
> There's another bug with rebase.autoStash in master (and next/pu) but
> not v2.19.0. I tried to bisect bit it just comes down to 5541bd5b8f
> ("rebase: default to using the builtin rebase", 2018-08-08).
> 
> Credit to a co-worker of mine who wishes to remain anonymous for
> discovering this. I narrowed down his test-case to (any repo will do):
>     
>     (
>         rm -rf /tmp/todo &&
>         git clone --single-branch --no-tags --branch=todo https://github.com/git/git.git /tmp/todo &&
>         cd /tmp/todo &&
>         rm Make &&
>         git rev-parse --abbrev-ref HEAD &&
>         git -c rebase.autoStash=true -c pull.rebase=true pull &&
>         if test $(git rev-parse --abbrev-ref HEAD) != 'todo'
>         then
>             echo 'On detached head!' &&
>             git status &&
>             exit 1
>         else
>             echo 'We are still on our todo branch!'
>         fi
>     )

I found the culprit. Patch forthcoming, Dscho

Previous: Jeff King
Message 6 of 6 in “Demonstrate and fix a rebase --autostash bug with dirty submodules”
  1. 0/2 Demonstrate and fix a rebase --autostash bug with dirty submodulesJohannes Schindelin via GitGitGadget, Oct 23, 2018
  2. 1/2 rebase --autostash: demonstrate a problem with dirty submodulesJohannes Schindelin via GitGitGadget, Oct 23, 2018
  3. 2/2 rebase --autostash: fix issue with dirty submodulesJohannes Schindelin via GitGitGadget, Oct 23, 2018
  4. Regression in rebase-in-C with rebase.autoStash=trueÆvar Arnfjörð Bjarmason, Nov 6, 2018
  5. Jeff KingNov 6, 2018
  6. Johannes SchindelinNov 7, 2018

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.