{"thread":{"id":"34591","subject":"[PATCH/RFC] log doc: explain --encoding=none and default output encoding","startedAt":"2013-08-02T22:39:24Z","lastAt":"2013-08-05T16:02:54Z","messageCount":2,"participants":["Jonathan Nieder","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"224467","messageId":"20130802223924.GA7634@elie.Belkin","threadId":"34591","inReplyTo":null,"subject":"[PATCH/RFC] log doc: explain --encoding=none and default output encoding","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2013-08-02T22:39:24Z","receivedAt":"2013-08-02T22:39:24Z","isPatch":true,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>\n---\nI'm not thrilled with the wording.  This can probably be explained\nmore simply.  Ideas?\n\n Documentation/pretty-options.txt | 10 ++++++++--\n 1 file changed, 8 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt\nindex 5e499421..e31fd494 100644\n--- a/Documentation/pretty-options.txt\n+++ b/Documentation/pretty-options.txt\n@@ -32,8 +32,14 @@ people using 80-column terminals.\n \tThe commit objects record the encoding used for the log message\n \tin their encoding header; this option can be used to tell the\n \tcommand to re-code the commit log message in the encoding\n-\tpreferred by the user.  For non plumbing commands this\n-\tdefaults to UTF-8.\n+\tpreferred by the user.  \"--encoding=none\" means to use the\n+\traw log message without paying attention to its encoding header.\n++\n+For non plumbing commands, the output encoding defaults to the commit\n+encoding (as set using the `i18n.commitEncoding` variable, or UTF-8\n+by default).  This default can be overridden using the\n+`i18n.logOutputEncoding` configuration item. See linkgit:git-config[1]\n+for details.\n \n --notes[=<ref>]::\n \tShow the notes (see linkgit:git-notes[1]) that annotate the\n-- \n1.8.4.rc1\n"},{"id":"224593","messageId":"7vvc3km8gh.fsf@alter.siamese.dyndns.org","threadId":"34591","inReplyTo":"20130802223924.GA7634@elie.Belkin","subject":"Re: [PATCH/RFC] log doc: explain --encoding=none and default output encoding","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-08-05T16:02:54Z","receivedAt":"2013-08-05T16:02:54Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder <jrnieder@gmail.com> writes:\n\n> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>\n> ---\n> I'm not thrilled with the wording.  This can probably be explained\n> more simply.  Ideas?\n\nSome random thoughts on text, both before and after this patch.\n\n - The first stentence in this paragraph up to the semicolon is\n   irrelevant (it is an implementation detail that allows us to\n   re-encode in the first place, and the user does not care).\n\n - The use of word \"default\" is fuzzy.  With this description, we\n   want to tell the user to what encoding we reencode to by default,\n   but it is easy to miss that the reencoding always happen for\n   output with or without --encoding=<anything> option (which is not\n   clear from the text, especially the original) and incorrectly\n   assume that without --encoding=<anything> the recorded text is\n   spit out without mangling.\n\nSo perhaps along this line?\n\n        --encoding=<encoding>::\n\n                The encoding used to output the log messages in commit\n                objects.  When this option is not given, non-plumbing\n                commands output messages in the commit log encoding\n                (`i18n.commitEncoding`, or UTF-8 if the configuration\n                variable is not set).  `--encoding=none` lets you view the\n                raw log message without any reencoding.\n\n>\n>  Documentation/pretty-options.txt | 10 ++++++++--\n>  1 file changed, 8 insertions(+), 2 deletions(-)\n>\n> diff --git a/Documentation/pretty-options.txt b/Documentation/pretty-options.txt\n> index 5e499421..e31fd494 100644\n> --- a/Documentation/pretty-options.txt\n> +++ b/Documentation/pretty-options.txt\n> @@ -32,8 +32,14 @@ people using 80-column terminals.\n>  \tThe commit objects record the encoding used for the log message\n>  \tin their encoding header; this option can be used to tell the\n>  \tcommand to re-code the commit log message in the encoding\n> -\tpreferred by the user.  For non plumbing commands this\n> -\tdefaults to UTF-8.\n> +\tpreferred by the user.  \"--encoding=none\" means to use the\n> +\traw log message without paying attention to its encoding header.\n> ++\n> +For non plumbing commands, the output encoding defaults to the commit\n> +encoding (as set using the `i18n.commitEncoding` variable, or UTF-8\n> +by default).  This default can be overridden using the\n> +`i18n.logOutputEncoding` configuration item. See linkgit:git-config[1]\n> +for details.\n>  \n>  --notes[=<ref>]::\n>  \tShow the notes (see linkgit:git-notes[1]) that annotate the\n"}]}