aboutsummaryrefslogtreecommitdiff
path: root/diff-cache.c
diff options
context:
space:
mode:
Diffstat (limited to 'diff-cache.c')
-rw-r--r--diff-cache.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/diff-cache.c b/diff-cache.c
index 40fd6b496..ff310ab35 100644
--- a/diff-cache.c
+++ b/diff-cache.c
@@ -204,11 +204,11 @@ int main(int argc, char **argv)
diff_setup(detect_rename, diff_score_opt, reverse_diff,
(generate_patch ? -1 : line_termination),
- 0, 0);
+ NULL, 0);
mark_merge_entries();
- tree = read_object_with_reference(tree_sha1, "tree", &size, 0);
+ tree = read_object_with_reference(tree_sha1, "tree", &size, NULL);
if (!tree)
die("bad tree object %s", argv[1]);
if (read_tree(tree, size, 1))