projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/gitk/gitk
[git.git]
/
diff-tree.c
diff --git
a/diff-tree.c
b/diff-tree.c
index
7148323
..
d1265d7
100644
(file)
--- a/
diff-tree.c
+++ b/
diff-tree.c
@@
-52,7
+52,7
@@
static int diff_root_tree(const unsigned char *new, const char *base)
void *tree;
struct tree_desc empty, real;
void *tree;
struct tree_desc empty, real;
- tree = read_object_with_reference(new,
"tree"
, &real.size, NULL);
+ tree = read_object_with_reference(new,
tree_type
, &real.size, NULL);
if (!tree)
die("unable to read root tree (%s)", sha1_to_hex(new));
real.buf = tree;
if (!tree)
die("unable to read root tree (%s)", sha1_to_hex(new));
real.buf = tree;
@@
-117,8
+117,12
@@
static int diff_tree_commit(struct commit *commit)
return 0;
else if (combine_merges) {
header = generate_header(sha1, sha1, commit);
return 0;
else if (combine_merges) {
header = generate_header(sha1, sha1, commit);
- return diff_tree_combined_merge(sha1, header,
- dense_combined_merges);
+ header = diff_tree_combined_merge(sha1, header,
+ dense_combined_merges,
+ &diff_options);
+ if (!header && verbose_header)
+ header_prefix = "\ndiff-tree ";
+ return 0;
}
}
}
}
@@
-285,10
+289,12
@@
int main(int argc, const char **argv)
usage(diff_tree_usage);
}
usage(diff_tree_usage);
}
- if (combine_merges) {
- diff_options.output_format = DIFF_FORMAT_PATCH;
+ if (combine_merges)
ignore_merges = 0;
ignore_merges = 0;
- }
+
+ /* We can only do dense combined merges with diff output */
+ if (dense_combined_merges)
+ diff_options.output_format = DIFF_FORMAT_PATCH;
if (diff_options.output_format == DIFF_FORMAT_PATCH)
diff_options.recursive = 1;
if (diff_options.output_format == DIFF_FORMAT_PATCH)
diff_options.recursive = 1;