All of lore.kernel.org
 help / color / mirror / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Cc: Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com>,
	git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
	Pratik Karki <predatoramigo@gmail.com>
Subject: Re: Regression in rebase-in-C with rebase.autoStash=true
Date: Wed, 7 Nov 2018 14:50:00 +0100 (STD)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.1811071436290.39@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <878t2671dc.fsf@evledraar.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]

Hi Ævar,

On Tue, 6 Nov 2018, Ævar Arnfjörð Bjarmason wrote:

> 
> 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

      parent reply	other threads:[~2018-11-07 13:50 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-23 19:57 [PATCH 0/2] Demonstrate and fix a rebase --autostash bug with dirty submodules Johannes Schindelin via GitGitGadget
2018-10-23 19:57 ` [PATCH 1/2] rebase --autostash: demonstrate a problem " Johannes Schindelin via GitGitGadget
2018-10-23 19:57 ` [PATCH 2/2] rebase --autostash: fix issue " Johannes Schindelin via GitGitGadget
2018-11-06 13:59 ` Regression in rebase-in-C with rebase.autoStash=true Ævar Arnfjörð Bjarmason
2018-11-06 19:32   ` Jeff King
2018-11-07 13:50   ` Johannes Schindelin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=nycvar.QRO.7.76.6.1811071436290.39@tvgsbejvaqbjf.bet \
    --to=johannes.schindelin@gmx.de \
    --cc=avarab@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=predatoramigo@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.