From 9364bf465d23ff26f5e2eb4ee52434e7a69894f1 Mon Sep 17 00:00:00 2001 From: Andrey Bienkowski Date: Tue, 20 Apr 2021 11:24:37 +0000 Subject: [PATCH] doc: clarify the filename encoding in git diff AFAICT parsing the output of `git diff --name-only master...feature` is the intended way of programmatically getting the list of files modified by a feature branch. It is impossible to parse text unless you know what encoding it is in. The output encoding of diff --name-only and Signed-off-by: Junio C Hamano --- Documentation/diff-options.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index aa2b5c11f20bf3..69de49f977b63e 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -293,11 +293,14 @@ explained for the configuration variable `core.quotePath` (see linkgit:git-config[1]). --name-only:: - Show only names of changed files. + Show only names of changed files. The file names are often encoded in UTF-8. + For more information see the discussion about encoding in the linkgit:git-log[1] + manual page. --name-status:: Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean. + Just like `--name-only` the file names are often encoded in UTF-8. --submodule[=]:: Specify how differences in submodules are shown. When specifying