Re: git pull bug report

From: Erwin Villejo <erwinvillejo@gmail.com>
Date: Nov 16, 2021, 01:43 UTC
Message-ID: <CADL96rt0ye6KkkoZqzBCgnZyRxRhQSYktkrdP3DtAj8uEZFwMw@mail.gmail.com>
In-Reply-To: <CADL96rsnUCXchnrTa1rZ7WgJz2kDA-3TzeOiCy4AXNFdXtTmng@mail.gmail.com>

Please check PR: https://github.com/gitgitgadget/git/pull/1078

Thanks.

On Tue, Nov 16, 2021 at 7:23 AM Erwin Villejo <erwinvillejo@gmail.com> wrote:

Show 29 quoted lines

>
> 361cb523 fixes only the --ff-only case.
>
> It's still broken for unspecified/unset fast-forward flag and config (pull.ff and pull.rebase).
>
> Br, Erwin
>
>
> On Tue, Nov 16, 2021, 3:40 AM Junio C Hamano, <gitster@pobox.com> wrote:
>>
>> Erwin Villejo <erwinvillejo@gmail.com> writes:
>>
>> > $ git pull
>> > hint: You have divergent branches and need to specify how to reconcile them.
>> > ...
>> > hint: invocation.
>> > fatal: Need to specify how to reconcile divergent branches.
>> > ```
>> >
>> >> What's different between what you expected and what actually happened?
>> > I expected no failure and no-op since local is ahead of upstream.
>> > Instead, `git pull`
>> > fails because it thinks the branches have diverged.
>>
>> I think this was fixed at 361cb523 (pull: --ff-only should make it a
>> noop when already-up-to-date, 2021-10-20); it was broken between Git
>> 2.33 and Git 2.33.1, IIRC.
>>
>> Thanks.