{"thread":{"id":"14704","subject":"[PATCH] Documentation: clarify diff.external limitations","startedAt":"2008-07-27T11:12:15Z","lastAt":"2008-07-27T11:12:15Z","messageCount":1,"participants":["Anders Melchiorsen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"85162","messageId":"1217157135-25090-1-git-send-email-mail@cup.kalibalik.dk","threadId":"14704","inReplyTo":null,"subject":"[PATCH] Documentation: clarify diff.external limitations","fromName":"Anders Melchiorsen","fromEmail":"mail@cup.kalibalik.dk","sentAt":"2008-07-27T11:12:15Z","receivedAt":"2008-07-27T11:12:15Z","isPatch":true,"sender":{"key":"mail@cup.kalibalik.dk","avatar":null},"body":"The diff.external examples pass a flag to gnu-diff, but that is not\nactually supported.\n\nWithout the flag, diff will still complain about an extra operand\nbecause git is passing 7 parameters to the external command.\n\nBoth of these are fixed by suggesting a diff-wrapper and pointing to\nthe description of the parameters passed.\n\nSigned-off-by: Anders Melchiorsen <mail@cup.kalibalik.dk>\n---\n Documentation/config.txt     |   10 ++++++----\n Documentation/git-config.txt |    2 +-\n 2 files changed, 7 insertions(+), 5 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex 798b551..1a13abc 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -92,7 +92,7 @@ Example\n \n \t# Our diff algorithm\n \t[diff]\n-\t\texternal = \"/usr/local/bin/gnu-diff -u\"\n+\t\texternal = /usr/local/bin/diff-wrapper\n \t\trenames = true\n \n \t[branch \"devel\"]\n@@ -563,9 +563,11 @@ diff.autorefreshindex::\n diff.external::\n \tIf this config variable is set, diff generation is not\n \tperformed using the internal diff machinery, but using the\n-\tgiven command.  Note: if you want to use an external diff\n-\tprogram only on a subset of your files, you might want to\n-\tuse linkgit:gitattributes[5] instead.\n+\tgiven command.  Can be overridden with the `GIT_EXTERNAL_DIFF'\n+\tenvironment variable.  The command is called with parameters\n+\tas described under \"git Diffs\" in linkgit:git[1].  Note: if\n+\tyou want to use an external diff program only on a subset of\n+\tyour files, you\tmight want to use linkgit:gitattributes[5] instead.\n \n diff.renameLimit::\n \tThe number of files to consider when performing the copy/rename\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 697824c..28e1861 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -222,7 +222,7 @@ Given a .git/config like this:\n \n \t; Our diff algorithm\n \t[diff]\n-\t\texternal = \"/usr/local/bin/gnu-diff -u\"\n+\t\texternal = /usr/local/bin/diff-wrapper\n \t\trenames = true\n \n \t; Proxy settings\n-- \n1.5.4.3\n"}]}