[PATCH] diff/diff-files: do not use --cc too aggressively
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Sep 18, 2008, 09:08 UTC
- Message-ID
- <7v7i99zuqh.fsf_-_@gitster.siamese.dyndns.org>
- In-Reply-To
- <48D203B3.90807@viscovery.net>
Textual diff output for unmerged paths was too eager to give condensed combined diff. This has two problems:
(1) "diff --base/--ours/--theirs" (and "diff-files -p" with the same) is
a request to compare with the named stage. We showed "-c -p" output
instead; (2) "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 | 7 ++++++- builtin-diff.c | 8 +++++++- 2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/builtin-diff-files.c b/builtin-diff-files.c index 9bf10bb..2b578c7 100644 --- a/builtin-diff-files.c +++ b/builtin-diff-files.c @@ -50,7 +50,12 @@ int cmd_diff_files(int argc, const char **argv, const char *prefix) 3 < rev.max_count) usage(diff_files_usage); - if (rev.max_count == -1 && + /* + * "diff-files --base -p" should not combine merges because it + * was not asked to. "diff-files -c -p" should not densify + * (the user should ask with "diff-files --cc" explicitly). + */ + if (rev.max_count == -1 && !rev.combine_merges && (rev.diffopt.output_format & DIFF_FORMAT_PATCH)) rev.combine_merges = rev.dense_combined_merges = 1; diff --git a/builtin-diff.c b/builtin-diff.c index 037c303..d5fe775 100644 --- a/builtin-diff.c +++ b/builtin-diff.c @@ -223,7 +223,13 @@ static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv argv++; argc--; } - if (revs->max_count == -1 && + /* + * "diff --base" should not combine merges because it was not + * asked to. "diff -c" should not densify (if the user wants + * dense one, --cc can be explicitly asked for, or just rely + * on the default). + */ + if (revs->max_count == -1 && !revs->combine_merges && (revs->diffopt.output_format & DIFF_FORMAT_PATCH)) revs->combine_merges = revs->dense_combined_merges = 1;
-- 1.6.0.2.412.g0bc80