projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tar-tree: Introduce write_entry()
[git.git]
/
combine-diff.c
diff --git
a/combine-diff.c
b/combine-diff.c
index
984103e
..
a23894d
100644
(file)
--- a/
combine-diff.c
+++ b/
combine-diff.c
@@
-726,7
+726,7
@@
static int show_patch_diff(struct combine_diff_path *elem, int num_parent,
if (header) {
shown_header++;
if (header) {
shown_header++;
- p
uts(header
);
+ p
rintf("%s%c", header, opt->line_termination
);
}
printf("diff --%s ", dense ? "cc" : "combined");
if (quote_c_style(elem->path, NULL, NULL, 0))
}
printf("diff --%s ", dense ? "cc" : "combined");
if (quote_c_style(elem->path, NULL, NULL, 0))
@@
-799,7
+799,7
@@
static void show_raw_diff(struct combine_diff_path *p, int num_parent, const cha
inter_name_termination = 0;
if (header)
inter_name_termination = 0;
if (header)
- p
uts(header
);
+ p
rintf("%s%c", header, line_termination
);
for (i = 0; i < num_parent; i++) {
if (p->parent[i].mode)
for (i = 0; i < num_parent; i++) {
if (p->parent[i].mode)