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

Re: What's cooking in git.git (Nov 2022, #04; Fri, 18)

From
Taylor Blau <me@ttaylorr.com>
Date
Nov 21, 2022, 01:00 UTC
Message-ID
<Y3rNlarjf8xcBUnA@nand.local>
In-Reply-To
<xmqq8rk5yvz8.fsf@gitster.g>
On Mon, Nov 21, 2022 at 09:47:23AM +0900, Junio C Hamano wrote:
Show 35 quoted lines
> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > Not only that. `ab/various-leak-fixes` still merges an older iteration:
> >
> > -- snip --
> > $ git range-diff ttaylorr/ab/various-leak-fixes~15^2...ttaylorr/pw/rebase-no-reflog-action
> > 1:  d6f756b0d66f ! 1:  d188a60d7228 sequencer: stop exporting GIT_REFLOG_ACTION
> >     @@ Commit message
> >          pass the reflog action around in a variable and use it to set
> >          GIT_REFLOG_ACTION in the child environment when running "git commit".
> >
> >     +    Within the sequencer GIT_REFLOG_ACTION is no longer set and is only read
> >     +    by sequencer_reflog_action(). It is still set by rebase before calling
> >     +    the sequencer, that will be addressed in the next commit. cherry-pick
> >     +    and revert are unaffected as they do not set GIT_REFLOG_ACTION before
> >     +    calling the sequencer.
> >     +
> >          Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> >     +    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> >          Signed-off-by: Taylor Blau <me@ttaylorr.com>
> >
> >       ## sequencer.c ##
> > 2:  be0a662f863c ! 2:  0e34efb31d89 rebase: stop exporting GIT_REFLOG_ACTION
> >     @@ Commit message
> >          reflog_action.
> >
> >          Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> >     +    Reviewed-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
> >          Signed-off-by: Taylor Blau <me@ttaylorr.com>
> >
> >       ## builtin/rebase.c ##
> > -- snap --
> >
> > And that superseded iteration of `pw/rebase-no-reflog-action` _did_ hit
> > `next`.
> Thanks, all.

Indeed, thanks for catching, Johannes -- I could have sworn that I rebuilt Ævar's topic when I got a new version of pw/rebase-no-reflog-action, but apparently not. Sorry about that.

Show 8 quoted lines
> So in short, we should
>
>  * revert the merge of ab/various-leak-fixes to 'next'
>
>  * rebuild ab/various-leak-fixes using the updated iteration of the
>    other topic
>
>  * merge rebuilt ab/various-leak-fixes to 'next'.
Yep, that will do the trick. Sorry for the extra juggling.

Thanks, Taylor

Previous: Junio C HamanoNext: Phillip Wood
Message 9 of 22 in “What's cooking in git.git (Nov 2022, #04; Fri, 18)”
  1. Taylor BlauNov 19, 2022
  2. SZEDER GáborNov 20, 2022
  3. Looking for a review (pretty-formats, hard truncation), was What's cooking in git.git (Nov 2022, #04; Fri, 18))Philip Oakley, Nov 20, 2022
  4. Junio C HamanoNov 21, 2022
  5. Philip OakleyNov 21, 2022
  6. Phillip WoodNov 20, 2022
  7. Johannes SchindelinNov 20, 2022
  8. Junio C HamanoNov 21, 2022
  9. Taylor BlauNov 21, 2022
  10. Phillip WoodNov 22, 2022
  11. Junio C HamanoNov 20, 2022
  12. Taylor BlauNov 20, 2022
  13. Junio C HamanoNov 20, 2022
  14. Taylor BlauNov 20, 2022
  15. Junio C HamanoNov 21, 2022
  16. Taylor BlauNov 22, 2022
  17. Junio C HamanoNov 21, 2022
  18. Taylor BlauNov 21, 2022
  19. Junio C HamanoNov 23, 2022
  20. ab/submodule-no-abspath (was Re: What's cooking in git.git (Nov 2022, #04; Fri, 18))Glen Choo, Nov 21, 2022
  21. submodule absorbgitdirs: use relative <from> and <to> pathsÆvar Arnfjörð Bjarmason, Nov 22, 2022
  22. Glen ChooNov 23, 2022

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.