projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Documentation: adjust cvsimport command line.
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
4e80526
..
5b9467d
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-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 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;
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()) {
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) {
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;
}
header = NULL;
}
- diff_flush(diff_output_format);
+ diff_flush(diff_output_format
, diff_line_termination
);
return 1;
}
return 1;
}
@@
-486,12
+487,8
@@
int main(int argc, const char **argv)
diff_output_format = DIFF_FORMAT_NAME;
continue;
}
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")) {
if (!strcmp(arg, "-z")) {
- diff_
output_format = DIFF_FORMAT_MACHINE
;
+ diff_
line_termination = 0
;
continue;
}
if (!strcmp(arg, "-m")) {
continue;
}
if (!strcmp(arg, "-m")) {