{"thread":{"id":"54171","subject":"[PATCH] git.txt: correct stale 'GIT_EXTERNAL_DIFF' description","startedAt":"2020-09-01T13:22:10Z","lastAt":"2020-09-01T19:16:32Z","messageCount":2,"participants":["Philippe Blain via GitGitGadget","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"404861","messageId":"pull.718.git.1598966412371.gitgitgadget@gmail.com","threadId":"54171","inReplyTo":null,"subject":"[PATCH] git.txt: correct stale 'GIT_EXTERNAL_DIFF' description","fromName":"Philippe Blain via GitGitGadget","fromEmail":"gitgitgadget@gmail.com","sentAt":"2020-09-01T13:20:12Z","receivedAt":"2020-09-01T13:22:10Z","isPatch":true,"sender":{"key":"levraiphilippeblain@gmail.com","avatar":"https://avatars.githubusercontent.com/u/44212482?v=4"},"body":"From: Philippe Blain <levraiphilippeblain@gmail.com>\n\nIn fde97d8ac6 (Update documentation to remove incorrect GIT_DIFF_OPTS\nexample., 2006-11-27), the description of the 'GIT_EXTERNAL_DIFF'\nvariable was moved from 'diff-format.txt' to 'git.txt', and the\ndocumentation was updated to remove a 'diff(1)' invocation since Git did\nnot use an external diff program anymore by default.\n\nHowever, the description of 'GIT_EXTERNAL_DIFF' still mentions \"instead\nof the diff invocation described above\", which is confusing.\n\nCorrect that outdated sentence.\n\nAlso, link to git(1) in 'diff-generate-patch.txt' when GIT_DIFF_OPTS and\nGIT_EXTERNAL_DIFF are mentioned, so that users can easily know what\nthese variables are about.\n\nSigned-off-by: Philippe Blain <levraiphilippeblain@gmail.com>\n---\n    git.txt: correct stale 'GIT_EXTERNAL_DIFF' description\n\nPublished-As: https://github.com/gitgitgadget/git/releases/tag/pr-718%2Fphil-blain%2Fgit-external-diff-wording-v1\nFetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-718/phil-blain/git-external-diff-wording-v1\nPull-Request: https://github.com/gitgitgadget/git/pull/718\n\n Documentation/diff-generate-patch.txt | 3 ++-\n Documentation/git.txt                 | 5 +++--\n 2 files changed, 5 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\nindex e8ed6470fb..b10ff4caa6 100644\n--- a/Documentation/diff-generate-patch.txt\n+++ b/Documentation/diff-generate-patch.txt\n@@ -10,7 +10,8 @@ linkgit:git-diff-tree[1], or\n linkgit:git-diff-files[1]\n with the `-p` option produces patch text.\n You can customize the creation of patch text via the\n-`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.\n+`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables\n+(see linkgit:git[1]).\n \n What the -p option produces is slightly different from the traditional\n diff format:\ndiff --git a/Documentation/git.txt b/Documentation/git.txt\nindex 2fc92586b5..98bdf0983c 100644\n--- a/Documentation/git.txt\n+++ b/Documentation/git.txt\n@@ -551,8 +551,9 @@ Git Diffs\n \n `GIT_EXTERNAL_DIFF`::\n \tWhen the environment variable `GIT_EXTERNAL_DIFF` is set, the\n-\tprogram named by it is called, instead of the diff invocation\n-\tdescribed above.  For a path that is added, removed, or modified,\n+\tprogram named by it is called to generate diffs, and Git\n+\tdoes not use its builtin diff machinery.\n+\tFor a path that is added, removed, or modified,\n \t`GIT_EXTERNAL_DIFF` is called with 7 parameters:\n \n \tpath old-file old-hex old-mode new-file new-hex new-mode\n\nbase-commit: d9cd4331470f4d9d78677f12dc79063dab832f53\n-- \ngitgitgadget\n"},{"id":"404876","messageId":"xmqqpn75cnp5.fsf@gitster.c.googlers.com","threadId":"54171","inReplyTo":"pull.718.git.1598966412371.gitgitgadget@gmail.com","subject":"Re: [PATCH] git.txt: correct stale 'GIT_EXTERNAL_DIFF' description","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-09-01T19:16:22Z","receivedAt":"2020-09-01T19:16:32Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"\"Philippe Blain via GitGitGadget\" <gitgitgadget@gmail.com> writes:\n\n> diff --git a/Documentation/diff-generate-patch.txt b/Documentation/diff-generate-patch.txt\n> index e8ed6470fb..b10ff4caa6 100644\n> --- a/Documentation/diff-generate-patch.txt\n> +++ b/Documentation/diff-generate-patch.txt\n> @@ -10,7 +10,8 @@ linkgit:git-diff-tree[1], or\n>  linkgit:git-diff-files[1]\n>  with the `-p` option produces patch text.\n>  You can customize the creation of patch text via the\n> -`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables.\n> +`GIT_EXTERNAL_DIFF` and the `GIT_DIFF_OPTS` environment variables\n> +(see linkgit:git[1]).\n>  \n>  What the -p option produces is slightly different from the traditional\n>  diff format:\n> diff --git a/Documentation/git.txt b/Documentation/git.txt\n> index 2fc92586b5..98bdf0983c 100644\n> --- a/Documentation/git.txt\n> +++ b/Documentation/git.txt\n> @@ -551,8 +551,9 @@ Git Diffs\n>  \n>  `GIT_EXTERNAL_DIFF`::\n>  \tWhen the environment variable `GIT_EXTERNAL_DIFF` is set, the\n> -\tprogram named by it is called, instead of the diff invocation\n> -\tdescribed above.  For a path that is added, removed, or modified,\n> +\tprogram named by it is called to generate diffs, and Git\n> +\tdoes not use its builtin diff machinery.\n> +\tFor a path that is added, removed, or modified,\n>  \t`GIT_EXTERNAL_DIFF` is called with 7 parameters:\n\nExcellent.  Thanks.   Will queue.\n"}]}