From: Junio C Hamano <gitster@pobox.com>
To: Olga Pilipenco <olga.pilipenco@shopify.com>
Cc: "Olga Pilipenco via GitGitGadget" <gitgitgadget@gmail.com>,
git@vger.kernel.org, "Patrick Steinhardt" <ps@pks.im>,
"Eric Sunshine" <sunshine@sunshineco.com>,
"Johannes Schindelin" <Johannes.Schindelin@gmx.de>,
"René Scharfe" <l.s.r@web.de>
Subject: Re: [PATCH v3] worktree: detect from secondary worktree if main worktree is bare
Date: Fri, 31 Jan 2025 12:20:17 -0800 [thread overview]
Message-ID: <xmqq8qqq7n26.fsf@gitster.g> (raw)
In-Reply-To: <CAFLeGL52tKmurpAHymk42Y9DGazbK8nRdtWAoyzW85eMDxJQhQ@mail.gmail.com> (Olga Pilipenco's message of "Fri, 31 Jan 2025 13:11:00 -0700")
Olga Pilipenco <olga.pilipenco@shopify.com> writes:
>> Perhaps the logic is clear to those who diagnosed the problem, wrote
>> the patch, and reviewed it, in which case there is no reason to
>> reroll. Perhaps it was just me to whom it was not obvious that
>> the purpose of "is_current" check was not about "are we looking at
>> the main worktree" but was about "if we are not in the main worktree,
>> we need this extra check".
>>
>> Thanks.
>
> You did a great job figuring it out and I agree it's confusing at
> first, but we tried our best to make it less confusing.
> `is_current` check is actually not necessary there, but having it there saves
> extra unnecessary calculations, also describes & fixes the exact scenario
> that didn't work (not being able to see main worktree as bare from a
> secondary worktree).
If I had to do a great job there, then the code does deserve to be
explained a bit better for later developers who wonder why it is
written in the way it is, perhaps we a single-liner comment?
Thanks.
next prev parent reply other threads:[~2025-01-31 20:20 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-11-15 6:52 [PATCH] worktree: detect from secondary worktree if main worktree is bare Olga Pilipenco via GitGitGadget
2025-01-16 21:35 ` [PATCH v2] " Olga Pilipenco via GitGitGadget
2025-01-19 22:30 ` Eric Sunshine
2025-01-28 21:44 ` Olga Pilipenco
2025-01-29 13:41 ` Eric Sunshine
2025-01-29 17:08 ` Junio C Hamano
[not found] ` <F15C12AB-2238-4553-AFA5-18277B18CE5A@shopify.com>
2025-01-30 14:32 ` Eric Sunshine
2025-01-30 14:44 ` Eric Sunshine
2025-01-31 7:05 ` Olga Pilipenco
2025-01-31 13:28 ` Eric Sunshine
2025-01-31 18:08 ` [PATCH v3] " Olga Pilipenco via GitGitGadget
2025-01-31 19:19 ` Junio C Hamano
2025-01-31 19:26 ` Junio C Hamano
2025-01-31 20:11 ` Olga Pilipenco
2025-01-31 20:20 ` Junio C Hamano [this message]
2025-02-04 19:03 ` Olga Pilipenco
2025-02-04 19:43 ` Junio C Hamano
2025-02-04 20:33 ` Olga Pilipenco
2025-02-05 6:30 ` [PATCH v4] " Olga Pilipenco via GitGitGadget
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=xmqq8qqq7n26.fsf@gitster.g \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=l.s.r@web.de \
--cc=olga.pilipenco@shopify.com \
--cc=ps@pks.im \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).