summaryrefslogtreecommitdiff
path: root/diff-helper.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-15 00:59:17 (GMT)
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-15 00:59:17 (GMT)
commite68b6f1525c670f474d735009fec419473df0962 (patch)
treec09b5a31f4557e0008ebe4da49f1b10b0765a944 /diff-helper.c
parentc0fd1f517efeb67df32b8d4ffa209afab14be436 (diff)
downloadgit-e68b6f1525c670f474d735009fec419473df0962.zip
git-e68b6f1525c670f474d735009fec419473df0962.tar.gz
git-e68b6f1525c670f474d735009fec419473df0962.tar.bz2
Split up "diff_format" into "format" and "line_termination".
This removes the separate "formats" for name and name-with-zero- termination. It also removes the difference between HUMAN and MACHINE formats, and they both become DIFF_FORMAT_RAW, with the difference being just in the line and inter-filename termination. It also makes the code easier to understand.
Diffstat (limited to 'diff-helper.c')
-rw-r--r--diff-helper.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-helper.c b/diff-helper.c
index 63aff69..6649fb5 100644
--- a/diff-helper.c
+++ b/diff-helper.c
@@ -17,7 +17,7 @@ static void flush_them(int ac, const char **av)
diffcore_std_no_resolve(av + 1,
pickaxe, pickaxe_opts,
orderfile, diff_filter);
- diff_flush(DIFF_FORMAT_PATCH);
+ diff_flush(DIFF_FORMAT_PATCH, '\n');
}
static const char *diff_helper_usage =