From: Philip Oakley <philipoakley@iee.email>
To: Tilman Vogel <tilman.vogel@web.de>, git@vger.kernel.org
Subject: Re: [BUG] git pull --rebase ignores rebase.autostash config when fast-forwarding
Date: Tue, 4 Jan 2022 12:59:34 +0000 [thread overview]
Message-ID: <1240d0cd-230d-8a80-2250-37336b834834@iee.email> (raw)
In-Reply-To: <9749fa2c-b08d-c08b-ce43-041d13852d02@web.de>
On 03/01/2022 18:08, Tilman Vogel wrote:
> Hi git-people,
>
> I ran into strange behavior when having rebase.autostash enabled and
> doing a git pull --rebase:
>
>> git config rebase.autostash true
>> git pull --rebase
> Updating cd9ff8a..f3c9840
> error: Your local changes to the following files would be overwritten by
> merge:
> content
> Please commit your changes or stash them before you merge.
> Aborting
>
> Confusingly, this fixes the issue:
>
>> git config merge.autostash true
>> git pull --rebase
> Updating cd9ff8a..f3c9840
> Created autostash: c615fda
> Fast-forward
> content | 1 +
> 1 file changed, 1 insertion(+)
> Applied autostash.
>
> Leaving me wonder why merge config options fix rebase behavior.
>
> So, in order to make it easier to check the problem, I added some
> test-cases to the git test-suite. Please see the attached patch.
>
> Or here:
> https://github.com/tvogel/git/commit/bc941f9357518a34cfa11788dfb8e7fa7f711705
>
> I did not try to find the root-cause as I am not experienced with the
> code-base but if there are questions, let me know.
Which version are you running?
There was a problem in 2.33.1 as per thread discussion:
https://lore.kernel.org/git/YYFEE%2F2g3SiM04zx@hades.panopticon/
(I'd searched the logs for ".autostash true")
Does that provide any guidance?
--
Philip
next prev parent reply other threads:[~2022-01-04 12:59 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-03 18:08 [BUG] git pull --rebase ignores rebase.autostash config when fast-forwarding Tilman Vogel
2022-01-04 12:59 ` Philip Oakley [this message]
2022-01-04 18:03 ` Philippe Blain
2022-01-04 18:29 ` Philippe Blain
[not found] ` <BB019E6A-90ED-4D5A-A756-FA8700897DE7@gmail.com>
2022-01-04 23:20 ` Philippe Blain
2022-01-04 21:03 ` Tilman Vogel
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1240d0cd-230d-8a80-2250-37336b834834@iee.email \
--to=philipoakley@iee.email \
--cc=git@vger.kernel.org \
--cc=tilman.vogel@web.de \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).