projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ls-files: rework exclude patterns.
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
60ad2b5
..
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;
}
@@
-395,7
+396,9
@@
static int diff_tree_stdin(char *line)
}
static char *diff_tree_usage =
}
static char *diff_tree_usage =
-"git-diff-tree [-p] [-r] [-z] [--stdin] [-m] [-s] [-v] [--pretty] [-t] [-R] [-B] [-M] [-C] [--find-copies-header] [-O<orderfile>] [-S<string>] [--pickaxe-all] <tree-ish> <tree-ish>";
+"git-diff-tree [--stdin] [-m] [-s] [-v] [--pretty] [-t] "
+"[<common diff options>] <tree-ish> <tree-ish>"
+COMMON_DIFF_OPTIONS_HELP;
int main(int argc, const char **argv)
{
int main(int argc, const char **argv)
{
@@
-438,7
+441,7
@@
int main(int argc, const char **argv)
diff_setup_opt |= DIFF_SETUP_REVERSE;
continue;
}
diff_setup_opt |= DIFF_SETUP_REVERSE;
continue;
}
- if (!strcmp(arg, "-p")) {
+ if (!strcmp(arg, "-p")
|| !strcmp(arg, "-u")
) {
diff_output_format = DIFF_FORMAT_PATCH;
recursive = 1;
continue;
diff_output_format = DIFF_FORMAT_PATCH;
recursive = 1;
continue;
@@
-480,8
+483,12
@@
int main(int argc, const char **argv)
find_copies_harder = 1;
continue;
}
find_copies_harder = 1;
continue;
}
+ if (!strcmp(arg, "--name-only")) {
+ diff_output_format = DIFF_FORMAT_NAME;
+ 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")) {