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

Re: [PATCH v3] rebase: remove the rebase.useBuiltin setting

From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date
Mar 15, 2019, 16:11 UTC
Message-ID
<87wol09kxv.fsf@evledraar.gmail.com>
In-Reply-To
<nycvar.QRO.7.76.6.1903151643300.41@tvgsbejvaqbjf.bet>
On Fri, Mar 15 2019, Johannes Schindelin wrote:
Show 47 quoted lines
> Hi Ævar,
>
> On Fri, 15 Mar 2019, Ævar Arnfjörð Bjarmason wrote:
>
>> Remove the rebase.useBuiltin setting, which was added as an escape
>> hatch to disable the builtin version of rebase first released with Git
>> 2.20.
>>
>> See [1] for the initial implementation of rebase.useBuiltin, and [2]
>> and [3] for the documentation and corresponding
>> GIT_TEST_REBASE_USE_BUILTIN option.
>>
>> Carrying the legacy version is a maintenance burden as seen in
>> 7e097e27d3 ("legacy-rebase: backport -C<n> and --whitespace=<option>
>> checks", 2018-11-20) and 9aea5e9286 ("rebase: fix regression in
>> rebase.useBuiltin=false test mode", 2019-02-13). Since the built-in
>> version has been shown to be stable enough let's remove the legacy
>> version.
>>
>> As noted in [3] having use_builtin_rebase() shell out to get its
>> config doesn't make any sense anymore, that was done for the purposes
>> of spawning the legacy rebase without having modified any global
>> state. Let's instead handle this case in rebase_config().
>>
>> There's still a bunch of references to git-legacy-rebase in po/*.po,
>> but those will be dealt with in time by the i18n effort.
>>
>> Even though this configuration variable only existed for one release
>> let's not entirely delete the entry from the docs, but note its
>> absence. Individual versions of git tend to be around for a while due
>> to distro packaging timelines, so e.g. if we're "lucky" a given
>> version like 2.21 might be installed on say OSX for half a decade.
>>
>> That'll mean some people probably setting this in config, and then
>> when they later wonder if it's needed they can Google search the
>> config option name or check it in git-config. It also allows us to
>> refer to the docs from the warning for details.
>>
>> 1. 55071ea248 ("rebase: start implementing it as a builtin",
>>    2018-08-07)
>> 2. d8d0a546f0 ("rebase doc: document rebase.useBuiltin", 2018-11-14)
>> 3. 62c23938fa ("tests: add a special setup where rebase.useBuiltin is
>>    off", 2018-11-14)
>> 3. https://public-inbox.org/git/nycvar.QRO.7.76.6.1903141544110.41@tvgsbejvaqbjf.bet/
>> ---
>
> With the obviously intended SOB line: ACK!

Urgh, Junio: If there's no other comments/concerns on v3 requiring a v4 this has my:

    Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Previous: Johannes SchindelinNext: Junio C Hamano
Message 24 of 31 in “rebase -x: sanity check command”
  1. rebase -x: sanity check commandPhillip Wood, Jan 28, 2019
  2. Junio C HamanoJan 28, 2019
  3. Johannes SchindelinJan 28, 2019
  4. Phillip WoodJan 29, 2019
  5. Johannes SchindelinJan 29, 2019
  6. Johannes SchindelinJan 28, 2019
  7. Phillip WoodJan 29, 2019
  8. Johannes SchindelinJan 29, 2019
  9. rebase -x: sanity check commandPhillip Wood, Jan 29, 2019
  10. Junio C HamanoJan 29, 2019
  11. Johannes SchindelinJan 30, 2019
  12. Ævar Arnfjörð BjarmasonFeb 13, 2019
  13. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Feb 13, 2019
  14. Johannes SchindelinFeb 13, 2019
  15. Junio C HamanoFeb 13, 2019
  16. rebase: fix regression in rebase.useBuiltin=false test modeÆvar Arnfjörð Bjarmason, Feb 13, 2019
  17. Junio C HamanoFeb 13, 2019
  18. Phillip WoodFeb 14, 2019
  19. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 14, 2019
  20. Johannes SchindelinMar 14, 2019
  21. Ævar Arnfjörð BjarmasonMar 14, 2019
  22. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 15, 2019
  23. Johannes SchindelinMar 15, 2019
  24. Ævar Arnfjörð BjarmasonMar 15, 2019
  25. Junio C HamanoMar 18, 2019
  26. Phillip WoodMar 18, 2019
  27. rebase: remove the rebase.useBuiltin settingÆvar Arnfjörð Bjarmason, Mar 18, 2019
  28. Phillip WoodMar 19, 2019
  29. rebase: remove transitory rebase.useBuiltin setting & envÆvar Arnfjörð Bjarmason, Mar 23, 2021
  30. Junio C HamanoMar 23, 2021
  31. Johannes SchindelinMar 23, 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.