All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Caleb White via B4 Relay <devnull+cdwhite3.pm.me@kernel.org>
Cc: git@vger.kernel.org,  Caleb White <cdwhite3@pm.me>,
	 Eric Sunshine <sunshine@sunshineco.com>
Subject: Re: [PATCH v3 0/3] Link worktrees with relative paths
Date: Tue, 08 Oct 2024 12:00:12 -0700	[thread overview]
Message-ID: <xmqq5xq21kub.fsf@gitster.g> (raw)
In-Reply-To: <20241007-wt_relative_paths-v3-0-622cf18c45eb@pm.me> (Caleb White via's message of "Mon, 07 Oct 2024 22:12:29 -0500")

Caleb White via B4 Relay <devnull+cdwhite3.pm.me@kernel.org> writes:

> - Rebased onto 20240923075416.54289-1-ericsunshine@charter.net
> ...
> base-commit: 4ec4435df758668055cc904ef64c275bc8d1089b
> change-id: 20241007-wt_relative_paths-88f9cf5a070c
> prerequisite-message-id: <20240923075416.54289-1-ericsunshine@charter.net>
> prerequisite-patch-id: 78371f4dbb635e6edab8c51ee7857b903e60df8f

It is more common on this list to explain how the base was prepared
in the cover letter, something like:

    The patch was built on the result of merging the
    es/worktree-repair-copied topic, i.e. 992f7a4f (worktree: repair
    copied repository and linked worktrees, 2024-09-23), to v2.47.0.

To help those who are reading from sidelines, the above may need
some deciphering, as the patches as posted do not cleanly apply to
the base-commit 4ec4435df, which is 777489f9 (Git 2.47, 2024-10-06).

    $ git grep '<2024092307...charter.net>' notes/amlog

finds that the message resulted in 992f7a4f (worktree: repair copied
repository and linked worktrees, 2024-09-23).  So the right base to
apply them is obtained by checking out the v2.47.0 and then merging
the es/worktree-repair-copied topic (which is a single commit topic
with the 992f7a4f on it).

    $ git checkout --detach 4ec4435df758^0
    $ git merge --into cw/worktree-relative es/worktree-repair-copied
    $ git am -s ./+cw-worktree-relative-3-patch-series

And of course the series applied cleanly ;-)  I haven't read them
yet, though.

Thanks.


  parent reply	other threads:[~2024-10-08 19:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-08  3:12 [PATCH v3 0/3] Link worktrees with relative paths Caleb White
2024-10-08  3:12 ` Caleb White via B4 Relay
2024-10-08  3:12 ` [PATCH v3 1/3] worktree: refactor infer_backlink() to use *strbuf Caleb White
2024-10-08  3:12   ` Caleb White via B4 Relay
2024-10-10 15:52   ` shejialuo
2024-10-10 16:41     ` Caleb White
2024-10-10 17:26       ` shejialuo
2024-10-10 17:52         ` Caleb White
2024-10-10 20:03           ` Junio C Hamano
2024-10-10 20:24             ` Caleb White
2024-10-10 19:14       ` Junio C Hamano
2024-10-08  3:12 ` [PATCH v3 2/3] worktree: link worktrees with relative paths Caleb White
2024-10-08  3:12   ` Caleb White via B4 Relay
2024-10-08 23:09   ` Junio C Hamano
2024-10-09 18:34     ` Caleb White
2024-10-09 19:10       ` Junio C Hamano
2024-10-09 19:19         ` Caleb White
2024-10-09 23:37           ` Junio C Hamano
2024-10-10 17:30             ` Caleb White
2024-10-11  4:03             ` Caleb White
2024-10-22  4:32             ` Caleb White
2024-10-09 10:11   ` Phillip Wood
2024-10-09 18:49     ` Caleb White
2024-10-08  3:12 ` [PATCH v3 3/3] worktree: add test for path handling in linked worktrees Caleb White
2024-10-08  3:12   ` Caleb White via B4 Relay
2024-10-08  4:48 ` [PATCH v3 0/3] Link worktrees with relative paths Caleb White
2024-10-08 19:00 ` Junio C Hamano [this message]
2024-10-08 21:55   ` Caleb White

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=xmqq5xq21kub.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=cdwhite3@pm.me \
    --cc=devnull+cdwhite3.pm.me@kernel.org \
    --cc=git@vger.kernel.org \
    --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 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.