From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Jeremy Huddleston Sequoia <jeremyhu@apple.com>,
git@vger.kernel.org, peff@peff.net
Subject: Re: [PATCH (Apple Git) 07/13] HTML documentation is not provided with Apple's git. Make the error message more on point.
Date: Wed, 30 Jan 2019 08:50:33 -0800 [thread overview]
Message-ID: <xmqqtvhq3x9i.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <nycvar.QRO.7.76.6.1901301444220.41@tvgsbejvaqbjf.bet> (Johannes Schindelin's message of "Wed, 30 Jan 2019 14:45:12 +0100 (STD)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Hi Junio,
>
> On Tue, 29 Jan 2019, Junio C Hamano wrote:
>
>> Jeremy Huddleston Sequoia <jeremyhu@apple.com> writes:
>>
>> > Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
>> > ---
>> > builtin/help.c | 2 +-
>> > 1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/builtin/help.c b/builtin/help.c
>> > index 7739a5c155..e001b6157c 100644
>> > --- a/builtin/help.c
>> > +++ b/builtin/help.c
>> > @@ -383,7 +383,7 @@ static void get_html_page_path(struct strbuf *page_path, const char *page)
>> > if (!strstr(html_path, "://")) {
>> > if (stat(mkpath("%s/git.html", html_path), &st)
>> > || !S_ISREG(st.st_mode))
>> > - die("'%s': not a documentation directory.", html_path);
>> > + die("HTML documentation is not provided by this distribution of git.");
>>
>> Mentioning HTML in the message may be a good idea, but I feel that
>> "distribution of git" is not something we should say in the source
>> for those who are building from the source. Distributors are free
>> to munge before they generate their binary distribution, of course
>> ;-).
>
> So maybe something like
>
> #ifdef MISSING_HTML_MESSAGE
> die(_(MISSING_HTML_MESSAGE));
> #else
> die("'%s': not a documentation directory.", html_path);
> #endif
>
> ?
No, distributors can fork and build from patched source. What I
meant was along these lines:
die(_("HTML documentation not installed in '%s'."), html_path));
die(_("The installer chose to omit HTML docs from '%s''.", html_path));
next prev parent reply other threads:[~2019-01-30 16:50 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-29 19:38 [PATCH (Apple Git) 00/13] Differences between git-2.20.1 and Apple Git-116 Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 01/13] .gitignore: Remove *.s as it matches *.S on case insensitive filesystem Jeremy Huddleston Sequoia
2019-01-30 11:33 ` Eric Sunshine
2019-01-30 11:37 ` Jeremy Huddleston Sequoia
2019-01-30 12:29 ` Eric Sunshine
2019-01-30 12:32 ` Eric Sunshine
2019-01-30 12:42 ` Johannes Schindelin
2019-01-30 19:13 ` Jeremy Huddleston Sequoia
2019-01-31 17:57 ` Junio C Hamano
2019-01-31 18:17 ` Jeremy Sequoia
2019-01-31 19:48 ` Eric Sunshine
2019-01-30 16:47 ` Junio C Hamano
2019-01-29 19:38 ` [PATCH (Apple Git) 02/13] test-lib: Export PERL5LIB for testing git-svn Jeremy Huddleston Sequoia
2019-01-29 22:47 ` Junio C Hamano
2019-01-29 23:46 ` Jeremy Huddleston Sequoia
2019-01-29 23:59 ` SZEDER Gábor
2019-01-30 0:01 ` Jeremy Sequoia
2019-01-30 18:59 ` Junio C Hamano
2019-01-30 0:07 ` Carlo Arenas
2019-01-30 12:51 ` Johannes Schindelin
2019-01-30 18:45 ` Jeremy Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 03/13] t0500: New regression test for git add of a path that contains a .git directory Jeremy Huddleston Sequoia
2019-01-30 11:47 ` Eric Sunshine
2019-01-30 13:12 ` Johannes Schindelin
2019-01-30 19:04 ` Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 04/13] t4014: git --version can have SP in it Jeremy Huddleston Sequoia
2019-01-29 22:58 ` Junio C Hamano
2019-01-30 13:30 ` Johannes Schindelin
2019-01-29 19:38 ` [PATCH (Apple Git) 05/13] t5701: " Jeremy Huddleston Sequoia
2019-01-30 13:36 ` Johannes Schindelin
2019-01-30 19:35 ` Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 06/13] Set Apple Git version during build Jeremy Huddleston Sequoia
2019-01-30 13:43 ` Johannes Schindelin
2019-01-30 19:45 ` Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 07/13] HTML documentation is not provided with Apple's git. Make the error message more on point Jeremy Huddleston Sequoia
2019-01-29 23:01 ` Junio C Hamano
2019-01-30 13:45 ` Johannes Schindelin
2019-01-30 16:50 ` Junio C Hamano [this message]
2019-01-30 19:34 ` Johannes Schindelin
2019-01-29 19:38 ` [PATCH (Apple Git) 08/13] git mergetool/difftool doesn't list 'opendiff' as an available tool on 10.8 Jeremy Huddleston Sequoia
2019-01-30 19:07 ` Johannes Schindelin
2019-01-29 19:38 ` [PATCH (Apple Git) 09/13] Use symbolic links rather than hard links for files in libexec Jeremy Huddleston Sequoia
2019-01-30 9:50 ` brian m. carlson
2019-01-30 11:41 ` Jeremy Huddleston Sequoia
2019-01-30 19:15 ` Johannes Schindelin
2019-01-30 20:52 ` Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 10/13] Support for Xcode.app co-exestince and relocation Jeremy Huddleston Sequoia
2019-01-30 19:26 ` Johannes Schindelin
2019-01-30 21:07 ` Jeremy Huddleston Sequoia
2019-01-29 19:38 ` [PATCH (Apple Git) 11/13] Fix problem found from running the test suite Jeremy Huddleston Sequoia
2019-01-29 23:12 ` Junio C Hamano
2019-01-29 23:30 ` Eric Wong
2019-01-29 19:38 ` [PATCH (Apple Git) 12/13] Enable support for Xcode.app-bundled gitconfig Jeremy Huddleston Sequoia
2019-01-29 23:10 ` Junio C Hamano
2019-01-29 23:51 ` Jeremy Huddleston Sequoia
2019-01-30 19:32 ` Johannes Schindelin
2019-01-30 21:09 ` Jeremy Huddleston Sequoia
2019-01-30 22:01 ` Jeremy Huddleston Sequoia
2019-01-31 0:01 ` Jonathan Nieder
2019-01-31 8:29 ` Jeremy Huddleston Sequoia
2019-01-31 18:06 ` Junio C Hamano
2019-01-30 9:44 ` brian m. carlson
2019-01-29 19:38 ` [PATCH (Apple Git) 13/13] Enable support for Xcode.app-bundled gitattributes Jeremy Huddleston Sequoia
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqtvhq3x9i.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jeremyhu@apple.com \
--cc=peff@peff.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).