Re: [PATCH v2] fsmonitor: check the untracked cache after a trivial response
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Nov 9, 2026, 21:34 UTC
- Message-ID
- <xmqqse19wuwy.fsf@gitster.g>
- In-Reply-To
- <xmqq8q31yb5s.fsf@gitster.g>
Junio C Hamano <gitster@pobox.com> writes:
Show 12 quoted lines
>> 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.