| commit | 903e09a3ecca8941b32bae08b821545941591348 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Sep 2008 07:32:37 +0000 (18 00:32 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 18 Sep 2008 17:49:03 +0000 (18 10:49 -0700) | ||
| tree | d91e053a26f3f295e05c3f6e2228d6bb8f5a57ec | treesnapshot (tar.gz zip) |
| parent | 1f5a892e5209be329dda316edb0341066d62e3eb | commitdiff |
diff/diff-files: do not use --cc too aggressively
Textual diff output for unmerged paths was too eager to give condensed
combined diff. Even though "diff -c" (and "diff-files -c -p") is a
request to view combined diff without condensing (otherwise the user would
have explicitly asked for --cc, not -c), we showed "--cc" output anyway.
0fe7c1d (built-in diff: assorted updates, 2006-04-29) claimed to be
careful about doing this, but its breakage was hidden because back then
"git diff" was still a shell script that did not use the codepath it
introduced fully.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Textual diff output for unmerged paths was too eager to give condensed
combined diff. Even though "diff -c" (and "diff-files -c -p") is a
request to view combined diff without condensing (otherwise the user would
have explicitly asked for --cc, not -c), we showed "--cc" output anyway.
0fe7c1d (built-in diff: assorted updates, 2006-04-29) claimed to be
careful about doing this, but its breakage was hidden because back then
"git diff" was still a shell script that did not use the codepath it
introduced fully.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin-diff-files.c | diffblobblamehistory | |
| builtin-diff.c | diffblobblamehistory |