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

Re: [GSoC] Regarding "Convert scripts to builtins"

From
Wink Saville <wink@saville.com>
Date
Mar 21, 2018, 19:17 UTC
Message-ID
<CAKk8isrOMMm0zyJ1JtH3aDm=tF5hwokZ0Wzn=D1BQ1R-qEPicw@mail.gmail.com>
In-Reply-To
<nycvar.QRO.7.76.6.1803211242190.77@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>

On Wed, Mar 21, 2018 at 5:32 AM, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:

> Hi Paul,
>
Show 17 quoted lines
> Note! There is one exception, and it is not even a full script. As
> everybody knows who follows my patch series on this here mailing list, I
> consider --preserve-merges one of my stupidest design mistakes ever. To
> undo this (or at least to alleviate the damage I caused), I already
> submitted a patch series to introduce a superseding option:
> --recreate-merges. This patch series is on hold due to the -rc phase of
> v2.17 and will be kicked back into action after v2.17.0 final is out. As
> it is my hope that --preserve-merges can be deprecated in favor of
> --recreate-merges (and eventually even phased out of Git), I would be
> totally cool with git-rebase--preserve-merges.sh being factored out of
> git-rebase--interactive.sh before converting the latter to pure C, and
> leaving the --preserve-merges script alone until the time when it is put
> to rest.
>
> (While I was sleeping, leaving this mail unfinished, to be completed and
> sent today, a patch series was sent to the mailing list that seems to
> perform this refactoring of --preserve-merges into its own script.)

I plead guilty to being the preson refactoring --preserve-merges. But after reading this and seeing that --recreate-merges is coming and possibly git-rebase--* moving to C I'm worried I'd be messing things up.

Also, Eric Sunshine felt my v1 changes causes the blame information to be obscured. So I created a v2 change which keeps everything in the git-rebase--interactive.sh.

Please see "[RFC PATCH 0/3] rebase-interactive" and "[RFC PATCH v2 0/1] rebase-interactive: ...". I'm looking for advice on how to proceed.

Previous: Johannes SchindelinNext: Johannes Schindelin
Message 5 of 8 in “[GSoC] Regarding "Convert scripts to builtins"”
  1. Paul Sebastian UngureanuMar 18, 2018
  2. Christian CouderMar 19, 2018
  3. Christian CouderMar 19, 2018
  4. Johannes SchindelinMar 21, 2018
  5. Wink SavilleMar 21, 2018
  6. Johannes SchindelinMar 22, 2018
  7. Wink SavilleMar 22, 2018
  8. Johannes SchindelinMar 23, 2018

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.