kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Junio C Hamano 2006-01-25 11:55:40 -08:00
parent 5290a0f812
commit e228340961
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
combine-diff.c
View File

@ -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