Skip to content

Commit 9c96c43

Browse files
committed
diff-files: fix incorrect usage of an empty tree
In c26022e (diff: convert diff_addremove to struct object_id, 2017-05-30), the OID to use for intent-to-add files was inadvertently changed from the empty blob to the empty tree. Let's revert that. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent b3d7a52 commit 9c96c43

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

diff-lib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ int run_diff_files(struct rev_info *revs, unsigned int option)
220220
} else if (revs->diffopt.ita_invisible_in_index &&
221221
ce_intent_to_add(ce)) {
222222
diff_addremove(&revs->diffopt, '+', ce->ce_mode,
223-
the_hash_algo->empty_tree, 0,
223+
the_hash_algo->empty_blob, 0,
224224
ce->name, 0);
225225
continue;
226226
}

0 commit comments

Comments
 (0)