X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=builtin-diff-files.c;h=2b578c714d36c600107f03b454ed8241dc2d4f19;hb=dd7f5f105a1d4d094a96c5e3f251854f81106be0;hp=9bf10bb37e2f56ec2a10239d7419db8fbb641745;hpb=a0d74d160f3d416be8f7fbfd18fee0eebf40d8e0;p=git.git

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 9bf10bb37..2b578c714 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;