summaryrefslogtreecommitdiff
path: root/diff-helper.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2005-05-28 04:05:38 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-29 18:40:40 (GMT)
commit2bc2564145835996734d6ed5d1880f85b17233d6 (patch)
treed9f1166f2e7320e38fe94824ea410e4e7f09bac7 /diff-helper.c
parentf0c6b2a2fd98b51f1f2655ea69ace9763da28e79 (diff)
downloadgit-2bc2564145835996734d6ed5d1880f85b17233d6.zip
git-2bc2564145835996734d6ed5d1880f85b17233d6.tar.gz
git-2bc2564145835996734d6ed5d1880f85b17233d6.tar.bz2
[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 <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'diff-helper.c')
-rw-r--r--diff-helper.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/diff-helper.c b/diff-helper.c
index 6456405..5ad2273 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);