All of lore.kernel.org
 help / color / mirror / Atom feed
From: Derrick Stolee <stolee@gmail.com>
To: Eric Sunshine <sunshine@sunshineco.com>,
	Elijah Newren <newren@gmail.com>
Cc: "Junio C Hamano" <gitster@pobox.com>,
	"Git List" <git@vger.kernel.org>,
	"Derrick Stolee" <dstolee@microsoft.com>,
	"Phillip Wood" <phillip.wood@dunelm.org.uk>,
	"Jean-Noël AVILA" <jn.avila@free.fr>
Subject: Re: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))
Date: Wed, 9 Feb 2022 09:57:24 -0500	[thread overview]
Message-ID: <fe2346f0-f65a-6c09-e2dc-f8c4e163a2b4@gmail.com> (raw)
In-Reply-To: <CAPig+cRrRxuTeByhKkLs_KDaWY8-r4+jrwT83A-r+sBQsmebMw@mail.gmail.com>

On 2/6/2022 6:41 AM, Eric Sunshine wrote:
> On Fri, Feb 4, 2022 at 7:06 AM Elijah Newren <newren@gmail.com> wrote:
>> On Fri, Feb 3, 2022 at 21:22 PM Junio C Hamano <gitster@pobox.com> wrote:
>>> * ds/sparse-checkout-requires-per-worktree-config (2022-01-31) 5 commits
>>>  - worktree: copy sparse-checkout patterns and config on add
>>>  - sparse-checkout: set worktree-config correctly
>>>  - config: add repo_config_set_worktree_gently()
>>>  - worktree: create init_worktree_config()
>>>  - Documentation: add extensions.worktreeConfig details
>>>
>>>  What's the doneness of this one?
>>>  source: <pull.1101.v5.git.1643641259.gitgitgadget@gmail.com>
>>
>> I think it's done and ready for next.
>>
>> Eric and I weighed in quite a bit on this series, and it changed
>> direction pretty dramatically, and more than once.  But we eventually
>> all came to an agreement about what should be done (the hard part),
>> and this round implements it.  Stolee has diligently fixed or answered
>> each item I've raised and I'm very happy with this version.
> 
> This version is much improved over earlier versions, and I think
> everyone is in agreement now that the series is "doing the right
> thing". However...
> 
> I just finished reviewing this round and left a bunch of comments.
> Some of the comments are minor and wouldn't warrant a reroll, but I
> also identified some memory leaks and fragile code, as well as
> non-obvious test code which could be improved. The commit message of
> [4/5] feels too weak for future readers by not fully explaining the
> problem(s) that the patch is addressing, so I suggested a possible
> rewrite of the message. All of these issues could be fixed by
> follow-on patches (with the exception of the weak commit message),
> however, taken together it feels like one more reroll is warranted.

(I finally got these emails delivered to GMail today...)

I sent v6 since this message.

There are some further comments by Junio and Jean-Noël that will
require another re-roll. There is time for more review before then,
so I will wait until next week to see if more comments come in.

Thanks,
-Stolee

  reply	other threads:[~2022-02-09 14:57 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-04  5:22 What's cooking in git.git (Feb 2022, #01; Thu, 3) Junio C Hamano
2022-02-04  7:00 ` Eric Sunshine
2022-02-05  8:00   ` Junio C Hamano
2022-02-04  8:13 ` Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Elijah Newren
2022-02-04 11:20   ` en/remerge-diff (was: Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3))) Ævar Arnfjörð Bjarmason
2022-02-04 16:42     ` en/remerge-diff Junio C Hamano
2022-02-06 11:41   ` Opinions on merging questions (Was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Eric Sunshine
2022-02-09 14:57     ` Derrick Stolee [this message]
2022-02-07 14:11   ` Phillip Wood
2022-02-04 11:25 ` jc/doc-log-messages (was: " Ævar Arnfjörð Bjarmason
2022-02-04 12:23 ` rj/receive-pack-abort-upon-disconnect " Ævar Arnfjörð Bjarmason
2022-02-04 12:25 ` cb/clear-quarantine-early-on-all-ref-update-errors " Ævar Arnfjörð Bjarmason
2022-02-04 16:45   ` cb/clear-quarantine-early-on-all-ref-update-errors Junio C Hamano
2022-02-04 12:29 ` ja/i18n-common-messages (was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Ævar Arnfjörð Bjarmason
2022-02-04 16:56   ` ja/i18n-common-messages Junio C Hamano
2022-02-05 12:18     ` ja/i18n-common-messages Jean-Noël AVILA
2022-02-06  8:12       ` ja/i18n-common-messages Bagas Sanjaya
2022-02-06 10:03         ` ja/i18n-common-messages Jean-Noël AVILA
2022-02-04 12:31 ` ps/avoid-unnecessary-hook-invocation-with-packed-refs (was: What's cooking in git.git (Feb 2022, #01; Thu, 3)) Ævar Arnfjörð Bjarmason
2022-02-04 12:36 ` ab/ambiguous-object-name " Ævar Arnfjörð Bjarmason
2022-02-04 13:05 ` tl/ls-tree-oid-only " Ævar Arnfjörð Bjarmason
2022-02-04 13:11 ` ab/only-single-progress-at-once " Ævar Arnfjörð Bjarmason

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=fe2346f0-f65a-6c09-e2dc-f8c4e163a2b4@gmail.com \
    --to=stolee@gmail.com \
    --cc=dstolee@microsoft.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jn.avila@free.fr \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=sunshine@sunshineco.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.