From: Junio C Hamano <junkio@cox.net>
Date: Wed, 25 Jan 2006 19:55:40 +0000 (-0800)
Subject: combine-diff: minor output changes.
X-Git-Tag: v1.2.0~100^3~4
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=e228340961e0f48c6b818251bd4729b2d19647e4;p=git.git

combine-diff: minor output changes.

Remove extra whitespace between the change indicators and the
body text.  That is more in line with the uncombined unified
diff output (pointed out by Santi Bejar).

When showing --cc, say so instead of saying just --combined.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/combine-diff.c b/combine-diff.c
index eb763e11..b0846bc0 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -386,7 +386,6 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent)
 					else
 						putchar(' ');
 				}
-				putchar(' ');
 				puts(ll->line);
 				ll = ll->next;
 			}
@@ -396,7 +395,7 @@ static void dump_sline(struct sline *sline, int cnt, int num_parent)
 				else
 					putchar('+');
 			}
-			printf(" %.*s\n", sl->len, sl->bol);
+			printf("%.*s\n", sl->len, sl->bol);
 		}
 	}
 }
@@ -503,7 +502,7 @@ int diff_tree_combined_merge(const unsigned char *sha1,
 		for (p = paths; p; p = p->next) {
 			if (!p->len)
 				continue;
-			printf("diff --combined ");
+			printf("diff --%s ", dense ? "cc" : "combined");
 			if (quote_c_style(p->path, NULL, NULL, 0))
 				quote_c_style(p->path, NULL, stdout, 0);
 			else