git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Patrick Steinhardt <ps@pks.im>
Cc: git@vger.kernel.org,
	 Michael Osipov <michael.osipov@innomotics.com>,
	Jeff King <peff@peff.net>
Subject: Re: [PATCH] t/unit-tests: update clar to fcbed04
Date: Thu, 11 Sep 2025 09:08:35 -0700	[thread overview]
Message-ID: <xmqqikhpotto.fsf@gitster.g> (raw)
In-Reply-To: <20250910-b4-pks-clar-update-v1-1-26a196237e0a@pks.im> (Patrick Steinhardt's message of "Wed, 10 Sep 2025 15:09:58 +0200")

Patrick Steinhardt <ps@pks.im> writes:

> Junio, I was wondering whether we also want to do this similarly to how
> you handle the gitk/git-gui pull requests. I ultimately don't mind it
> much though, so I'm also happy to do this with "normal" patch series.

I do not think the "git merge -Xsubtree=$directory $URL" merges have
givem us much benefit as we originally hoped.  Even though we have
full history of the other projects' theoretically, digging something
out of that history has not been as seamless process as it could.  I
always ended up doing things in a two-step fashion, i.e.

 (1) ask "log --first-parent" the last commit that touched the
     -Xsubtree=$directory, then

 (2) dig from the second parent of that commit.  This is another
     reason why I do not like to *move* the -Xsubtree=$directory
     without a good rationale.

So I wouldn't particularly recommend it.

Thanks.

      reply	other threads:[~2025-09-11 16:08 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-09-10 13:09 [PATCH] t/unit-tests: update clar to fcbed04 Patrick Steinhardt
2025-09-11 16:08 ` 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=xmqqikhpotto.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=michael.osipov@innomotics.com \
    --cc=peff@peff.net \
    --cc=ps@pks.im \
    /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).