summaryrefslogtreecommitdiff
path: root/diff-files.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-files.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-files.c')
-rw-r--r--diff-files.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/diff-files.c b/diff-files.c
index 4e7d967..39dd54f 100644
--- a/diff-files.c
+++ b/diff-files.c
@@ -11,7 +11,8 @@ static const char *diff_files_usage =
"[<common diff options>] [<path>...]"
COMMON_DIFF_OPTIONS_HELP;
-static int diff_output_format = DIFF_FORMAT_HUMAN;
+static int diff_output_format = DIFF_FORMAT_RAW;
+static int diff_line_termination = '\n';
static int detect_rename = 0;
static int find_copies_harder = 0;
static int diff_setup_opt = 0;
@@ -57,11 +58,9 @@ int main(int argc, const char **argv)
else if (!strcmp(argv[1], "-s"))
; /* no-op */
else if (!strcmp(argv[1], "-z"))
- diff_output_format = DIFF_FORMAT_MACHINE;
+ diff_line_termination = 0;
else if (!strcmp(argv[1], "--name-only"))
diff_output_format = DIFF_FORMAT_NAME;
- else if (!strcmp(argv[1], "--name-only-z"))
- diff_output_format = DIFF_FORMAT_NAME_Z;
else if (!strcmp(argv[1], "-R"))
diff_setup_opt |= DIFF_SETUP_REVERSE;
else if (!strncmp(argv[1], "-S", 2))
@@ -153,6 +152,6 @@ int main(int argc, const char **argv)
pickaxe, pickaxe_opts,
diff_break_opt,
orderfile, diff_filter);
- diff_flush(diff_output_format);
+ diff_flush(diff_output_format, diff_line_termination);
return 0;
}