projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix up previous commit
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
b43df18
..
5559dd3
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-11,6
+11,7
@@
static int read_stdin = 0;
static int line_termination = '\n';
static int generate_patch = 0;
static int detect_rename = 0;
static int line_termination = '\n';
static int generate_patch = 0;
static int detect_rename = 0;
+static int reverse_diff = 0;
static int diff_score_opt = 0;
static const char *header = NULL;
static const char *header_prefix = "";
static int diff_score_opt = 0;
static const char *header = NULL;
static const char *header_prefix = "";
@@
-270,7
+271,7
@@
static int diff_tree_sha1_top(const unsigned char *old,
{
int ret;
{
int ret;
- diff_setup(detect_rename, diff_score_opt,
0
,
+ diff_setup(detect_rename, diff_score_opt,
reverse_diff
,
(generate_patch ? -1 : line_termination),
0, 0);
ret = diff_tree_sha1(old, new, base);
(generate_patch ? -1 : line_termination),
0, 0);
ret = diff_tree_sha1(old, new, base);
@@
-284,7
+285,7
@@
static int diff_root_tree(const unsigned char *new, const char *base)
void *tree;
unsigned long size;
void *tree;
unsigned long size;
- diff_setup(detect_rename, diff_score_opt,
0
,
+ diff_setup(detect_rename, diff_score_opt,
reverse_diff
,
(generate_patch ? -1 : line_termination),
0, 0);
tree = read_object_with_reference(new, "tree", &size, 0);
(generate_patch ? -1 : line_termination),
0, 0);
tree = read_object_with_reference(new, "tree", &size, 0);
@@
-429,7
+430,7
@@
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] [-m] [-s] [-v] <tree-ish> <tree-ish>";
+"git-diff-tree [-p] [-r] [-z] [--stdin] [-M] [-
R] [-
m] [-s] [-v] <tree-ish> <tree-ish>";
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
@@
-464,6
+465,10
@@
int main(int argc, char **argv)
recursive = 1;
continue;
}
recursive = 1;
continue;
}
+ if (!strcmp(arg, "-R")) {
+ reverse_diff = 1;
+ continue;
+ }
if (!strcmp(arg, "-p")) {
recursive = generate_patch = 1;
continue;
if (!strcmp(arg, "-p")) {
recursive = generate_patch = 1;
continue;