mirror of
https://github.com/git/git
synced 2024-08-24 02:11:08 +00:00
87f1b8849b
The function is intended to be fed one logical line at a time to inspect, but a QP encoded raw input line can have more than one lines, just like BASE64 encoded one. Quoting LF as =0A may be unusual but RFC2045 allows it. The issue was noticed and fixed by Jay Soffian. JC added a test to protect the fix from regressing later. Signed-off-by: Jay Soffian <jaysoffian@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
14 lines
511 B
Plaintext
14 lines
511 B
Plaintext
diff --git a/Documentation/diff-format.txt b/Documentation/diff-format.txt
|
|
index b426a14..97756ec 100644
|
|
--- a/Documentation/diff-format.txt
|
|
+++ b/Documentation/diff-format.txt
|
|
@@ -81,7 +81,7 @@ The "diff" formatting options can be customized via the
|
|
environment variable 'GIT_DIFF_OPTS'. For example, if you
|
|
prefer context diff:
|
|
|
|
- GIT_DIFF_OPTS=-c git-diff-index -p $(cat .git/HEAD)
|
|
+ GIT_DIFF_OPTS=-c git-diff-index -p HEAD
|
|
|
|
|
|
2. When the environment variable 'GIT_EXTERNAL_DIFF' is set, the
|