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

Re: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))

From
PWPhillip Wood <phillip.wood123@gmail.com>
Date
Feb 7, 2022, 14:11 UTC
Message-ID
<fcba4c20-c29c-c114-c1ca-ac61b9725827@gmail.com>
In-Reply-To
<20220204081336.3194538-1-newren@gmail.com>
On 04/02/2022 08:13, Elijah Newren wrote:
Show 32 quoted lines
> Hi,
> 
> I thought I'd respond to some of your questions with my opinion and
> pointers, in case it's helpful...
> 
>> * pw/fix-some-issues-in-reset-head (2022-01-26) 14 commits
>>   - rebase -m: don't fork git checkout
>>   - rebase --apply: set ORIG_HEAD correctly
>>   - rebase --apply: fix reflog
>>   - reset_head(): take struct rebase_head_opts
>>   - rebase: cleanup reset_head() calls
>>   - create_autostash(): remove unneeded parameter
>>   - reset_head(): make default_reflog_action optional
>>   - reset_head(): factor out ref updates
>>   - reset_head(): remove action parameter
>>   - rebase --apply: don't run post-checkout hook if there is an error
>>   - rebase: do not remove untracked files on checkout
>>   - rebase: pass correct arguments to post-checkout hook
>>   - t5403: refactor rebase post-checkout hook tests
>>   - rebase: factor out checkout for up to date branch
>>
>>   Use an internal call to reset_head() helper function instead of
>>   spawning "git checkout" in "rebase", and update code paths that are
>>   involved in the change.
>>
>>   Will merge to 'next'?
>>   May want to rename the topic branch to "pw/use-in-process-checkout-in-rebase"
>>   or something before doing so.
>>   source: <pull.1049.v3.git.1643202349.gitgitgadget@gmail.com>
> 
> This series seems good to me and I think it's ready, but the topic
> branch rename sounds good.

Thanks for looking at the latest version. I think it is ready for next. Ævar suggested using a designated initialize in the conversion of reset_head() to take a struct but I think that makes it harder to review the conversion c.f. <7b56e91b-a7c9-b7cb-356c-e9615b9459fa@gmail.com>. He seemed to be happy with the rest of the series.

Best Wishes
Phillip
Previous: Derrick StoleeNext: Ævar Arnfjörð Bjarmason
Message 9 of 22 in “What's cooking in git.git (Feb 2022, #01; Thu, 3)”
  1. Junio C HamanoFeb 4, 2022
  2. Eric SunshineFeb 4, 2022
  3. Junio C HamanoFeb 5, 2022
  4. Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Elijah Newren, Feb 4, 2022
  5. en/remerge-diff (was: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  6. Junio C HamanoFeb 4, 2022
  7. Eric SunshineFeb 6, 2022
  8. Derrick StoleeFeb 9, 2022
  9. Phillip WoodFeb 7, 2022
  10. jc/doc-log-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  11. rj/receive-pack-abort-upon-disconnect (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  12. cb/clear-quarantine-early-on-all-ref-update-errors (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  13. Junio C HamanoFeb 4, 2022
  14. ja/i18n-common-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  15. Junio C HamanoFeb 4, 2022
  16. Jean-Noël AVILAFeb 5, 2022
  17. Bagas SanjayaFeb 6, 2022
  18. Jean-Noël AVILAFeb 6, 2022
  19. ps/avoid-unnecessary-hook-invocation-with-packed-refs (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  20. ab/ambiguous-object-name (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  21. tl/ls-tree-oid-only (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 2022
  22. ab/only-single-progress-at-once (was: What's cooking in git.git (Feb 2022, #01; Thu, 3))Ævar Arnfjörð Bjarmason, Feb 4, 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.