[00/11] Updates to worktree code and docs

Message

Johannes Schindelin via GitGitGadget Feb. 20, 2022, 5:54 p.m. UTC

This is built on top of ds/sparse-checkout-requires-per-worktree-config and
includes some forward fixes for comments from that series.

 * Patch 1 combines two translatable messages into one. (Thanks, Jean-Noël)
 * Patches 2-4 extract methods from the already-busy add_worktree() method.
   (Thanks, Eric)
 * Patches 5-11 update git-worktree.txt to use 'worktree' over 'working
   tree'. This involves some rewrapping of the paragraphs, so the diffs are
   not obviously just a find and replace. I split the changes mostly by
   section of the file to keep the diffs from being too large.

Thanks, -Stolee

Derrick Stolee (11):
  worktree: combine two translatable messages
  worktree: extract copy_filtered_worktree_config()
  worktree: extract copy_sparse_checkout()
  worktree: extract checkout_worktree()
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'
  worktree: use 'worktree' over 'working tree'

 Documentation/git-worktree.txt | 271 ++++++++++++++++-----------------
 builtin/worktree.c             | 138 +++++++++--------
 2 files changed, 210 insertions(+), 199 deletions(-)


base-commit: 3ce113827287079dced9aaf9c5d1e1734ecaa265
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-1154%2Fderrickstolee%2Fworktree-forward-fixes-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-1154/derrickstolee/worktree-forward-fixes-v1
Pull-Request: https://github.com/gitgitgadget/git/pull/1154

Comments

Taylor Blau Feb. 20, 2022, 10:38 p.m. UTC | #1

On Sun, Feb 20, 2022 at 05:54:16PM +0000, Derrick Stolee via GitGitGadget wrote:
> This is built on top of ds/sparse-checkout-requires-per-worktree-config and
> includes some forward fixes for comments from that series.

Thanks, I took a careful look through these and they all mostly look
good to me.

I left a couple of small notes throughout, but I wouldn't be sad if you
ignored any or all of them (though see my notes on the very last patch,
where I think you replaced one too many instances of "working tree").

Thanks,
Taylor

Taylor Blau Feb. 20, 2022, 10:41 p.m. UTC | #2

On Sun, Feb 20, 2022 at 05:38:20PM -0500, Taylor Blau wrote:
> On Sun, Feb 20, 2022 at 05:54:16PM +0000, Derrick Stolee via GitGitGadget wrote:
> > This is built on top of ds/sparse-checkout-requires-per-worktree-config and
> > includes some forward fixes for comments from that series.
>
> Thanks, I took a careful look through these and they all mostly look
> good to me.
>
> I left a couple of small notes throughout, but I wouldn't be sad if you
> ignored any or all of them (though see my notes on the very last patch,
> where I think you replaced one too many instances of "working tree").

In this (and a handful of other replies), my 'group-reply' macro was too
eager to drop any entries in the Cc list that it couldn't parse, so a
handful of recipients got dropped.

That's fine, since nothing in any of those messages was critical in
terms of reaching those individuals, but they are CC'd here just in
case.

Thanks,
Taylor