Merge branch 'ct/diff-with-merge-base-clarification' into master

[thirdparty/git.git] / diff-lib.c

diff --git a/diff-lib.c b/diff-lib.c
index 61812f48c2737a4702e604962e97f5c00d394b16..25fd2dee19c4a8f6408d768d44d8dc92aeaf0ed3 100644 (file)
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -220,8 +220,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
                        } else if (revs->diffopt.ita_invisible_in_index &&
                                   ce_intent_to_add(ce)) {
                                diff_addremove(&revs->diffopt, '+', ce->ce_mode,
-                                              the_hash_algo->empty_tree, 0,
-                                              ce->name, 0);
+                                              &null_oid, 0, ce->name, 0);
                                continue;
                        }