mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split up "diff_format" into "format" and "line_termination".

Browse Source 
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.
This commit is contained in:
Linus Torvalds
2005-07-14 17:59:17 -07:00
parent c0fd1f517e
commit e68b6f1525
7 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
diff-tree.c
View File

@ -9,7 +9,8 @@ static int ignore_merges = 1;
static int recursive = 0;
static int show_tree_entry_in_recursive = 0;
static int read_stdin = 0;
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;
@ -276,14 +277,14 @@ static int call_diff_flush(void)
orderfile,
diff_filter);
if (diff_queue_is_empty()) {
diff_flush(DIFF_FORMAT_NO_OUTPUT);
diff_flush(DIFF_FORMAT_NO_OUTPUT, diff_line_termination);
return 0;
}
if (header) {
printf("%s%c", header, diff_output_format == DIFF_FORMAT_MACHINE ? 0 : '\n');
printf("%s%c", header, diff_line_termination);
header = NULL;
}
diff_flush(diff_output_format);
diff_flush(diff_output_format, diff_line_termination);
return 1;
}
@ -486,12 +487,8 @@ int main(int argc, const char **argv)
diff_output_format = DIFF_FORMAT_NAME;
continue;
}
if (!strcmp(arg, "--name-only-z")) {
diff_output_format = DIFF_FORMAT_NAME_Z;
continue;
}
if (!strcmp(arg, "-z")) {
diff_output_format = DIFF_FORMAT_MACHINE;
diff_line_termination = 0;
continue;
}
if (!strcmp(arg, "-m")) {