git/builtin/worktree.c, branch v2.43.2

Merge branch 'jc/comment-style-fixes' into maint-2.43

2024-02-13T22:44:48Z

Rewrite //-comments to /* comments */ in files whose comments prevalently use the latter. * jc/comment-style-fixes: reftable/pq_test: comment style fix merge-ort.c: comment style fix builtin/worktree: comment style fixes

Merge branch 'jc/orphan-unborn' into maint-2.43

2024-02-09T00:22:10Z

Doc updates to clarify what an "unborn branch" means. * jc/orphan-unborn: orphan/unborn: fix use of 'orphan' in end-user facing messages orphan/unborn: add to the glossary and use them consistently

builtin/worktree: comment style fixes

2024-01-29T22:08:52Z

Signed-off-by: Junio C Hamano

worktree: simplify incompatibility message for --orphan and commit-ish

2023-12-08T22:41:03Z

Use a single translatable string to report that the worktree add option --orphan is incompatible with a commit-ish instead of having the commit-ish in a separate translatable string. This reduces the number of strings to translate and gives translators the full context. A similar message is used in builtin/describe.c, but with the plural of commit-ish, and here we need the singular form. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

worktree: standardize incompatibility messages

2023-12-08T22:41:03Z

Use the standard parameterized message for reporting incompatible options for worktree add. This reduces the number of strings to translate and makes the UI slightly more consistent. Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

orphan/unborn: fix use of 'orphan' in end-user facing messages

2023-11-24T03:11:23Z

"orphan branch" is not even grammatical ("orphaned branch" is), and we have been using "unborn branch" to mean the state where the HEAD points at a branch that does not yet exist. Update end-user facing messages to correct them. There are cases other random words are used (e.g., "unparented branch") but now we have a glossary entry, use the term "unborn branch" consistently. Signed-off-by: Junio C Hamano

worktree: mark unused parameters in each_ref_fn callback

2023-08-30T00:56:24Z

This is similar to the cases in 63e14ee2d6 (refs: mark unused each_ref_fn parameters, 2022-08-19), but it was added after that commit. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

Merge branch 'ja/worktree-orphan'

2023-08-25T17:37:37Z

Typofix in an error message. * ja/worktree-orphan: builtin/worktree.c: fix typo in "forgot fetch" msg

builtin/worktree.c: fix typo in "forgot fetch" msg

2023-08-13T23:35:37Z

Replace misspelled word "overide" with correctly spelled "override". Reported-By: Teng Long Signed-off-by: Jacob Abel Signed-off-by: Junio C Hamano

Merge branch 'ja/worktree-orphan-fix'

2023-08-04T17:52:30Z

Fix tests with unportable regex patterns. * ja/worktree-orphan-fix: t2400: rewrite regex to avoid unintentional PCRE builtin/worktree.c: convert tab in advice to space t2400: drop no-op `--sq` from rev-parse call