From 2bc2564145835996734d6ed5d1880f85b17233d6 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 27 May 2005 21:05:38 -0700 Subject: [PATCH] [PATCH] Adjust diff-helper to diff-tree -v -z changes. The latest change to diff-tree -z output adds an extra line termination after non diff-raw material (the header and the commit message). To compensate for this change, stop adding the output termination of our own. "diff-tree -v -z" piped to "diff-helper -z" would give different result from "diff-tree -v" piped to "diff-helper" without this change. Signed-off-by: Junio C Hamano Signed-off-by: Linus Torvalds --- diff-helper.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/diff-helper.c b/diff-helper.c index 6456405b5..5ad2273bf 100644 --- a/diff-helper.c +++ b/diff-helper.c @@ -15,6 +15,7 @@ static const char *diff_helper_usage = int main(int ac, const char **av) { struct strbuf sb; + const char *garbage_flush_format; strbuf_init(&sb); @@ -30,6 +31,8 @@ int main(int ac, const char **av) { usage(diff_helper_usage); ac--; av++; } + garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n"; + /* the remaining parameters are paths patterns */ diff_setup(0); @@ -134,7 +137,7 @@ int main(int ac, const char **av) { if (pickaxe) diffcore_pickaxe(pickaxe, pickaxe_opts); diff_flush(DIFF_FORMAT_PATCH, 0); - printf("%s\n", sb.buf); + printf(garbage_flush_format, sb.buf); } if (1 < ac) diffcore_pathspec(av + 1); -- 2.30.2