All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Derrick Stolee <stolee@gmail.com>
Cc: Ilia via GitGitGadget <gitgitgadget@gmail.com>,
	 git@vger.kernel.org, Ilia <ki.stfu@gmail.com>
Subject: Re: [PATCH v2] fsmonitor: check the untracked cache after a trivial response
Date: Mon, 09 Nov 2026 13:34:53 -0800	[thread overview]
Message-ID: <xmqqse19wuwy.fsf@gitster.g> (raw)
In-Reply-To: <xmqq8q31yb5s.fsf@gitster.g> (Junio C. Hamano's message of "Mon, 09 Nov 2026 12:58:39 -0800")

Junio C Hamano <gitster@pobox.com> writes:

>> Thanks for these improvements. The v2 patch LGTM.
>>
>>>      * rebased against ToT
>>
>> Generally, you shouldn't do this as the maintainer will apply
>> your patch in the same spot and handle most merge conflicts
>> via rerere, but rebasing interrupts that. The main exception
>> is when you rebase onto a specific topic or with regards to a
>> large refactor that merged recently.
>
> Good suggestion.  Worse yet, the topic is already in 'next' so a
> wholesale replacement is not very welcome.

Well, I ended up reverting the merge to 'next', and queued this
iteration (applied on exactly the same base as v1 was applied in my
tree---the patch cleanly applied as if there were no rebase).  I'll
mark the topic again ready for 'next' after waiting for a few days
to see if there are any more feedback.

Thanks, all.

      reply	other threads:[~2026-11-09 21:34 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-04 15:19 [PATCH] fsmonitor: check the untracked cache after a trivial response Ilia via GitGitGadget
2026-11-05 15:01 ` Derrick Stolee
2026-11-05 18:24   ` Junio C Hamano
2026-11-09 18:59     ` Ilia K
2026-11-09 19:14 ` [PATCH v2] " Ilia via GitGitGadget
2026-11-09 20:47   ` Derrick Stolee
2026-11-09 20:58     ` Junio C Hamano
2026-11-09 21:34       ` Junio C Hamano [this message]

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=xmqqse19wuwy.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=ki.stfu@gmail.com \
    --cc=stolee@gmail.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.