diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-12-14 17:04:37 +0900 |
| commit | 2378ebcb588cb08fc2a353fbfd1891ce53d15d54 (patch) | |
| tree | baeea6938d5d3e52df64b3197f7a0fbf14824cc7 | |
| parent | c382988d7bca3bcae3119e550ff5b29bf8af0d6a (diff) | |
| parent | b14f1df9f26cf87856cf6767847ccb4a5b31499b (diff) | |
| download | git-2378ebcb588cb08fc2a353fbfd1891ce53d15d54.tar.gz | |
Merge branch 'kh/advise-w-git-help-in-branch'
A help message from "git branch" now mentions "git help" instead of
"man" when suggesting to read some documentation.
* kh/advise-w-git-help-in-branch:
branch: advice using git-help(1) instead of man(1)
| -rw-r--r-- | branch.c | 2 | ||||
| -rw-r--r-- | builtin/branch.c | 2 | ||||
| -rwxr-xr-x | t/t3200-branch.sh | 6 |
3 files changed, 5 insertions, 5 deletions
@@ -375,7 +375,7 @@ int validate_branchname(const char *name, struct strbuf *ref) if (check_branch_ref(ref, name)) { int code = die_message(_("'%s' is not a valid branch name"), name); advise_if_enabled(ADVICE_REF_SYNTAX, - _("See `man git check-ref-format`")); + _("See 'git help check-ref-format'")); exit(code); } diff --git a/builtin/branch.c b/builtin/branch.c index 9fcf04bebb..c577b5d20f 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -591,7 +591,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int else { int code = die_message(_("invalid branch name: '%s'"), oldname); advise_if_enabled(ADVICE_REF_SYNTAX, - _("See `man git check-ref-format`")); + _("See 'git help check-ref-format'")); exit(code); } } diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index f3e720dc10..c58e505c43 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -1707,9 +1707,9 @@ test_expect_success '--track overrides branch.autoSetupMerge' ' ' test_expect_success 'errors if given a bad branch name' ' - cat <<-\EOF >expect && - fatal: '\''foo..bar'\'' is not a valid branch name - hint: See `man git check-ref-format` + cat <<-EOF >expect && + fatal: ${SQ}foo..bar${SQ} is not a valid branch name + hint: See ${SQ}git help check-ref-format${SQ} hint: Disable this message with "git config set advice.refSyntax false" EOF test_must_fail git branch foo..bar >actual 2>&1 && |