Message ID | 20241007-wt_relative_paths-v3-0-622cf18c45eb@pm.me (mailing list archive) |
---|---|
Headers | show |
Series | Link worktrees with relative paths | expand |
On Monday, October 7th, 2024 at 22:12, Caleb White via B4 Relay <devnull+cdwhite3.pm.me@kernel.org> wrote: > Changes in v3: > - Squashed patch [3/4] into patch [2/4] to streamline changes. > - Dropped patch [4/4] as it was no longer necessary. > - Rebased onto 20240923075416.54289-1-ericsunshine@charter.net > - Updated `infer_backlink()` to return 1 on success for consistency. > - Swapped the order of `infer_backlink()` arguments for clarity. > - Clear `inferred` if error occurs in `infer_backlink()`. > - Renamed `git_contents` to `dotgit_contents` for clearer semantics. > - Cleaned up `dotgit_contents` logic in `repair_worktree_at_path()`. > - Replaced multiple `xstrfmt/free` calls with a single `strbuf`. > - Added a test case covering a failure noted in a separate patch series. > - Improved commit messages. > - Link to v2: https://lore.kernel.org/r/20241006060017.171788-1-cdwhite3@pm.me All, my apologies for the patch corruption in the first two revisions (I suspect it was due to my SMTP server). I've submitted this v3 series with b4 using the public submission endpoint and I think it turned out much better. But please let me know if you have any issues. Thanks!
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.
On Tuesday, October 8th, 2024 at 14:00, Junio C Hamano <gitster@pobox.com> wrote: > 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 Ah, thank you, I'll make preparing the base more clear in the next revision. This is just how b4 tracks things so it knows how to apply the deps. > And of course the series applied cleanly ;-) I haven't read them > yet, though. That's good to hear :)