averello/git-mirror
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2025-12-12 20:36:24 +01:00
Code Issues 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"); parse_path_eol(&path, p, "path");
/* Git does not track empty, non-toplevel directories. */ /* 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); tree_content_remove(&b->branch_tree, path.buf, NULL, 0);
return; return;
} }

2
cache-tree.c
View File

@@ -422,7 +422,7 @@ static int update_one(struct cache_tree *it,
/* /*
* "sub" can be an empty tree if all subentries are i-t-a. * "sub" can be an empty tree if all subentries are i-t-a.
*/ */
if (contains_ita && is_empty_tree_oid(oid)) if (contains_ita && is_empty_tree_oid(oid, the_repository->hash_algo))
continue; continue;
strbuf_grow(&buffer, entlen + 100); strbuf_grow(&buffer, entlen + 100);

4
diffcore-rename.c
View File

@@ -1422,7 +1422,7 @@ void diffcore_rename_extended(struct diff_options *options,
strcmp(options->single_follow, p->two->path)) strcmp(options->single_follow, p->two->path))
continue; /* not interested */ continue; /* not interested */
else if (!options->flags.rename_empty && else if (!options->flags.rename_empty &&
is_empty_blob_oid(&p->two->oid)) is_empty_blob_oid(&p->two->oid, the_repository->hash_algo))
continue; continue;
else if (add_rename_dst(p) < 0) { else if (add_rename_dst(p) < 0) {
warning("skipping rename detection, detected" warning("skipping rename detection, detected"
@@ -1432,7 +1432,7 @@ void diffcore_rename_extended(struct diff_options *options,
} }
} }
else if (!options->flags.rename_empty && else if (!options->flags.rename_empty &&
is_empty_blob_oid(&p->one->oid)) is_empty_blob_oid(&p->one->oid, the_repository->hash_algo))
continue; continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) { else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
/* /*

12
hash-ll.h
View File

@@ -350,4 +350,16 @@ static inline int is_null_oid(const struct object_id *oid)
const char *empty_tree_oid_hex(void); const char *empty_tree_oid_hex(void);
const char *empty_blob_oid_hex(void); const char *empty_blob_oid_hex(void);
static inline int is_empty_blob_oid(const struct object_id *oid,
const struct git_hash_algo *algop)
{
return oideq(oid, algop->empty_blob);
}
static inline int is_empty_tree_oid(const struct object_id *oid,
const struct git_hash_algo *algop)
{
return oideq(oid, algop->empty_tree);
}
#endif #endif

10
hash.h
View File

@@ -6,14 +6,4 @@
#define the_hash_algo the_repository->hash_algo #define the_hash_algo the_repository->hash_algo
static inline int is_empty_blob_oid(const struct object_id *oid)
{
return oideq(oid, the_hash_algo->empty_blob);
}
static inline int is_empty_tree_oid(const struct object_id *oid)
{
return oideq(oid, the_hash_algo->empty_tree);
}
#endif #endif

2
read-cache.c
View File

@@ -337,7 +337,7 @@ static int ce_match_stat_basic(const struct cache_entry *ce, struct stat *st)
/* Racily smudged entry? */ /* Racily smudged entry? */
if (!ce->ce_stat_data.sd_size) { if (!ce->ce_stat_data.sd_size) {
if (!is_empty_blob_oid(&ce->oid)) if (!is_empty_blob_oid(&ce->oid, the_repository->hash_algo))
changed |= DATA_CHANGED; changed |= DATA_CHANGED;
} }