From: "Kristoffer Haugsbakk" <kristofferhaugsbakk@fastmail•com>
To: "Junio C Hamano" <gitster@pobox•com>, "Toon Claes" <toon@iotcl•com>
Cc: git@vger•kernel.org, "Patrick Steinhardt" <ps@pks•im>,
"Christian Couder" <chriscool@tuxfamily•org>
Subject: Re: [PATCH v2] combine-diff: don't override recursive flag in diff_tree_combined()
Date: Fri, 05 Sep 2025 17:37:03 +0200 [thread overview]
Message-ID: <cbee77df-19e7-4070-aa79-a80107cbcc65@app.fastmail.com> (raw)
In-Reply-To: <xmqq5xdw537l.fsf@gitster.g>
On Fri, Sep 5, 2025, at 17:27, Junio C Hamano wrote:
> Toon Claes <toon@iotcl•com> writes:
>
>> This patch is based on 'next' at 1ba7204a04 (Merge branch
>> 'kh/doc-markup-fixes' into next, 2025-09-03).
>
> Can't you be a bit more specific? We usually say "do not build on
> 'next'", but what we really mean by that statement are
>
> * Your topic may interact with some topics already in 'next', but
> it is unlikely that you depend on _all_ of them. If you are
> willing to depend on a few selected topics (meaning: you accept
> that you have to adjust your topic when they get updated, and you
> accept that you cannot graduate before all of them graduate),
> identify them and build on the result of a merge of these topics
> into 'master'. State how you constructed your base in your cover
> letter.
>
> * If you are truly depending on _everything_ in 'next', then stop.
> Wait until all of them graduates, and then submit your topic
> after that.
It seemed like Toon was applying the part in SubmittingPatches about
applying fixup patches on top of the series once the series is in
`next`.[1] But then used `next` as the base instead of the series.
Of course that simple topic named kh/doc-markup-fixes is irrelevant to
what he is fixing up. ;)
† 1: “After the patches are merged to the 'next' branch,”
--
Kristoffer Haugsbakk
next prev parent reply other threads:[~2025-09-05 15:38 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-05 13:06 [PATCH v2] combine-diff: don't override recursive flag in diff_tree_combined() Toon Claes
2025-09-05 15:27 ` Junio C Hamano
2025-09-05 15:37 ` Kristoffer Haugsbakk [this message]
2025-09-08 12:19 ` Toon Claes
2025-09-16 7:11 ` Patrick Steinhardt
2025-09-16 15:22 ` Toon Claes
2025-09-18 5:49 ` Patrick Steinhardt
2025-09-18 8:00 ` [PATCH v3] last-modified: fix bug when some paths remain unhandled Toon Claes
2025-09-18 15:18 ` Junio C Hamano
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=cbee77df-19e7-4070-aa79-a80107cbcc65@app.fastmail.com \
--to=kristofferhaugsbakk@fastmail$(echo .)com \
--cc=chriscool@tuxfamily$(echo .)org \
--cc=git@vger$(echo .)kernel.org \
--cc=gitster@pobox$(echo .)com \
--cc=ps@pks$(echo .)im \
--cc=toon@iotcl$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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