From: Felipe Contreras <felipe.contreras@gmail.com>
To: Philippe Blain <levraiphilippeblain@gmail.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Cc: Git mailing list <git@vger.kernel.org>,
Denton Liu <liu.denton@gmail.com>
Subject: Re: Regression in 'git pull --rebase --autostash' since v2.32.0
Date: Fri, 23 Jul 2021 11:11:32 -0500 [thread overview]
Message-ID: <60faea3498189_defb208e7@natae.notmuch> (raw)
In-Reply-To: <4b20a7ad-5e1e-802f-021b-a4580e5138fe@gmail.com>
Philippe Blain wrote:
> Le 2021-07-17 à 23:05, Felipe Contreras a écrit :
> > Philippe Blain wrote:
> >> Le 2021-07-17 à 15:34, Felipe Contreras a écrit :
> >
> >> The fix I suggested in [1] seems to fix both cases, but as I wrote there
> >> it still leaves two code paths that might trigger the bug. I'm not familiar
> >> at all with the code for these two code paths, so I'm not ready to send
> >> a formal patch; I thought I'd send the diff anyway if you or Denton (or anyone
> >> else) wants to start from there.
> >
> > Unfortunately I'm not familiar with the `git merge` code either, I've
> > only been modifying the `git pull` code, so I would also be starting
> > from scratch if I tried to fix that myself.
> >
> > But I think that's where it should be fixed.
>
> I've just sent a patch series that fixes it:
>
> https://lore.kernel.org/git/pull.1002.git.1627042470.gitgitgadget@gmail.com/T/#t
Thank you. I've reviewed the series and looks fine to me.
--
Felipe Contreras
prev parent reply other threads:[~2021-07-23 16:11 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-17 15:29 Regression in 'git pull --rebase --autostash' since v2.32.0 Philippe Blain
2021-07-17 17:03 ` Philippe Blain
2021-07-17 19:34 ` Felipe Contreras
2021-07-17 23:02 ` Philippe Blain
2021-07-18 3:05 ` Felipe Contreras
2021-07-23 12:17 ` Philippe Blain
2021-07-23 16:11 ` Felipe Contreras [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=60faea3498189_defb208e7@natae.notmuch \
--to=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=levraiphilippeblain@gmail.com \
--cc=liu.denton@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.