undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Adjust diff-helper to diff-tree -v -z changes.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-05-27 21:05:38 -07:00 committed by Linus Torvalds
parent f0c6b2a2fd
commit 2bc2564145
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diff-helper.c
View File

@ -15,6 +15,7 @@ static const char *diff_helper_usage =
int main(int ac, const char **av) { int main(int ac, const char **av) {
struct strbuf sb; struct strbuf sb;
const char *garbage_flush_format;
strbuf_init(&sb); strbuf_init(&sb);
@ -30,6 +31,8 @@ int main(int ac, const char **av) {
usage(diff_helper_usage); usage(diff_helper_usage);
ac--; av++; ac--; av++;
} }
garbage_flush_format = (line_termination == 0) ? "%s" : "%s\n";
/* the remaining parameters are paths patterns */ /* the remaining parameters are paths patterns */
diff_setup(0); diff_setup(0);
@ -134,7 +137,7 @@ int main(int ac, const char **av) {
if (pickaxe) if (pickaxe)
diffcore_pickaxe(pickaxe, pickaxe_opts); diffcore_pickaxe(pickaxe, pickaxe_opts);
diff_flush(DIFF_FORMAT_PATCH, 0); diff_flush(DIFF_FORMAT_PATCH, 0);
printf("%s\n", sb.buf); printf(garbage_flush_format, sb.buf);
} }
if (1 < ac) if (1 < ac)
diffcore_pathspec(av + 1); diffcore_pathspec(av + 1);