diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-08-04 20:52:30 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-08-04 20:52:30 +0300 |
commit | 4d060018467d5a8d05349294baad426d5407414d (patch) | |
tree | d4a054590fe77f36562531cb4903b1545945ac79 /builtin/worktree.c | |
parent | 3365e2675e5ac95e0a44665966e8cfbb9433456e (diff) | |
parent | d1b72cb36487772fa70217f4234c886db7a5892f (diff) |
Merge branch 'ja/worktree-orphan-fix'
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
Diffstat (limited to 'builtin/worktree.c')
-rw-r--r-- | builtin/worktree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/worktree.c b/builtin/worktree.c index 2ce39b593c..4cd01842de 100644 --- a/builtin/worktree.c +++ b/builtin/worktree.c @@ -53,14 +53,14 @@ "(branch with no commits) for this repository, you can do so\n" \ "using the --orphan flag:\n" \ "\n" \ - " git worktree add --orphan -b %s %s\n") + " git worktree add --orphan -b %s %s\n") #define WORKTREE_ADD_ORPHAN_NO_DASH_B_HINT_TEXT \ _("If you meant to create a worktree containing a new orphan branch\n" \ "(branch with no commits) for this repository, you can do so\n" \ "using the --orphan flag:\n" \ "\n" \ - " git worktree add --orphan %s\n") + " git worktree add --orphan %s\n") static const char * const git_worktree_usage[] = { BUILTIN_WORKTREE_ADD_USAGE, |