diff options
| author | Mark Wooding <mdw@distorted.org.uk> | 2006-02-27 12:52:52 +0000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 04:09:41 -0800 |
| commit | feffaddce0cec7fd3f749d23e95579b683961002 (patch) | |
| tree | 152774873a68c4a24dc1f06fd6518be9aeb4ac39 | |
| parent | b9003c06a89a6d78255bb837c921ca03ee27fae6 (diff) | |
| download | git-feffaddce0cec7fd3f749d23e95579b683961002.tar.gz | |
combine-diff: Honour -z option correctly.
Combined diffs don't null terminate things in the same way as standard
diffs. This is presumably wrong.
Signed-off-by: Mark Wooding <mdw@distorted.org.uk>
Signed-off-by: Junio C Hamano <junkio@cox.net>
(cherry picked from 6baf0484efcd29bb5e58ccd5ea0379481d4a83f4 commit)
| -rw-r--r-- | combine-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/combine-diff.c b/combine-diff.c index 984103edce..a23894d869 100644 --- 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++; - puts(header); + printf("%s%c", header, opt->line_termination); } 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) - puts(header); + printf("%s%c", header, line_termination); for (i = 0; i < num_parent; i++) { if (p->parent[i].mode) |