mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hash: require hash algorithm in is_empty_{blob,tree}_oid()

Browse Source 
Both functions `is_empty_{blob,tree}_oid()` use `the_repository` to
derive the hash function that shall be used. Require callers to pass in
the hash algorithm to get rid of this implicit dependency.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt
2024-06-14 08:50:13 +02:00
committed by Junio C Hamano
parent 861e8c76f6
commit 9c34eb93fb
6 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin/fast-import.c
View File

@ -2361,7 +2361,9 @@ static void file_change_m(const char *p, struct branch *b)
parse_path_eol(&path, p, "path");
/* Git does not track empty, non-toplevel directories. */
if (S_ISDIR(mode) && is_empty_tree_oid(&oid) && *path.buf) {
if (S_ISDIR(mode) &&
is_empty_tree_oid(&oid, the_repository->hash_algo) &&
*path.buf) {
tree_content_remove(&b->branch_tree, path.buf, NULL, 0);
return;
}