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

Re: jc/fix-pull-ff-only-when-already-up-to-date, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 10, 2021, 19:17 UTC
Message-ID
<xmqqlf1vyg5g.fsf@gitster.g>
In-Reply-To
<nycvar.QRO.7.76.6.2111102000250.21127@tvgsbejvaqbjf.bet>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 20 quoted lines
>> I didn't recall I did it as a regression fix, but as a fix for
>> relatively old change that is already in released version(s) in the
>> field.  If the breakage is new between 2.33.0 and 'master', I think
>> it is a good idea to merge it down.
>
> I can say with conviction that this is a very recent change of behavior,
> as I needed this quick-fix on Oct 30:
> https://github.com/git-for-windows/build-extra/commit/fb311a97cf82243ea1fe4036f1b180f5a3e6bc7f
>
> I don't recall the particular details how this fix came about, as it was
> the day of -rc0 (and I don't remember whether I needed this _before_ or
> _after_ Git for Windows -rc0 was released). All I remember is that an
> automated build broke because it created a local commit and then expected
> `git pull --ff-only` to succeed (because the remote was not ahead, but it
> necessarily was behind the local HEAD).
>
> The change of behavior might have been introduced by v2.33.1, or by
> v2.34.0-rc0.
>
> So yeah, I would argue that it is a regression introduced in this cycle.

Yeah, I was agreeing with you. Together with the simple-ipc thing, we will have two fixes in the final one on top of -rc2; hopefully these would be the last ones ;-)

Thanks.
Previous: Johannes SchindelinNext: Emily Shaffer
Message 10 of 15 in “What's cooking in git.git (Nov 2021, #03; Tue, 9)”
  1. Junio C HamanoNov 10, 2021
  2. js/scalar, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)Johannes Schindelin, Nov 10, 2021
  3. Ævar Arnfjörð BjarmasonNov 10, 2021
  4. Junio C HamanoNov 11, 2021
  5. Johannes SchindelinNov 12, 2021
  6. jc/fix-pull-ff-only-when-already-up-to-date, was Re: What's cooking in git.git (Nov 2021, #03; Tue, 9)Johannes Schindelin, Nov 10, 2021
  7. Junio C HamanoNov 10, 2021
  8. Alex HenrieNov 10, 2021
  9. Johannes SchindelinNov 10, 2021
  10. Junio C HamanoNov 10, 2021
  11. Emily ShafferNov 11, 2021
  12. Emily ShafferNov 11, 2021
  13. Junio C HamanoNov 11, 2021
  14. Glen ChooNov 11, 2021
  15. ab/config-based-hooks-2 etc. (was: What's cooking in git.git (Nov 2021, #03; Tue, 9))Ævar Arnfjörð Bjarmason, Nov 13, 2021

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.