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

Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)

From
Junio C Hamano <gitster@pobox.com>
Date
Dec 11, 2020, 07:17 UTC
Message-ID
<xmqqim98inml.fsf@gitster.c.googlers.com>
In-Reply-To
<CAMP44s2Po25VyHs-xQG0_oKhAOvPK_PNu5edQkYYsScZeBw1nw@mail.gmail.com>
Felipe Contreras <felipe.contreras@gmail.com> writes:
Show 8 quoted lines
> On Thu, Dec 10, 2020 at 12:28 PM Junio C Hamano <gitster@pobox.com> wrote:
> ...
>> how much damage are we causing to
>> existing users who expect the command to work the way it currently
>> does?
>
> Zero. Because my proposal does *not* make the pull fail, it merely
> prints a warning that it will change in the future.

The approach to hold the "future" patch of and keep giving a "warning" is still likely to cause damage to people like Ted and Dscho (both gave examples of workflowsand automation that currently happily creating merges as the user expects, while the user just ignores the warning, without being configured at all), when finally the "future" patch (after fixing the test breakages, of course) lands. They just ignored the current loud messages---I do not see any reason to expect the updated "warning" would have any effect on them and help them to prepare for the future default change.

It is either being dishonest or deliberatly closing eyes to say "Zero" after hearing what they said, I would have to say.

Previous: Felipe ContrerasNext: Theodore Y. Ts'o
Message 18 of 30 in “What's cooking in git.git (Dec 2020, #01; Tue, 8)”
  1. Junio C HamanoDec 9, 2020
  2. Taylor BlauDec 9, 2020
  3. Jonathan TanDec 10, 2020
  4. Elijah NewrenDec 9, 2020
  5. Junio C HamanoDec 9, 2020
  6. Taylor BlauDec 9, 2020
  7. Junio C HamanoDec 10, 2020
  8. Jonathan TanDec 10, 2020
  9. fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 9, 2020
  10. Junio C HamanoDec 9, 2020
  11. Felipe ContrerasDec 10, 2020
  12. Johannes SchindelinDec 10, 2020
  13. Johannes SchindelinDec 10, 2020
  14. Felipe ContrerasDec 10, 2020
  15. Theodore Y. Ts'oDec 10, 2020
  16. Junio C HamanoDec 10, 2020
  17. Felipe ContrerasDec 11, 2020
  18. Junio C HamanoDec 11, 2020
  19. Theodore Y. Ts'oDec 11, 2020
  20. Felipe ContrerasDec 12, 2020
  21. Felipe ContrerasDec 11, 2020
  22. Felipe ContrerasDec 10, 2020
  23. Junio C HamanoDec 11, 2020
  24. js/init-defaultbranch-advice, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 9, 2020
  25. Junio C HamanoDec 9, 2020
  26. Johannes SchindelinDec 10, 2020
  27. Junio C HamanoDec 10, 2020
  28. Felipe ContrerasDec 11, 2020
  29. bc/rev-parse-path-format, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)Johannes Schindelin, Dec 10, 2020
  30. Junio C HamanoDec 10, 2020

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.