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

dir: convert struct sha1_stat to use object_id

Browse Source 
Convert the declaration of struct sha1_stat. Adjust all usages of this
struct and replace hash{clr,cmp,cpy} with oid{clr,cmp,cpy} wherever
possible.  Rename it to struct oid_stat.

Rename static function load_sha1_stat to load_oid_stat.

Remove macro EMPTY_BLOB_SHA1_BIN, as it's no longer used.

Signed-off-by: Patryk Obara <patryk.obara@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patryk Obara
2018-01-28 01:13:12 +01:00
committed by Junio C Hamano
parent 829e5c3b92
commit 4b33e60201
4 changed files with 58 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dir.h
View File

@ -74,9 +74,9 @@ struct exclude_list_group {
struct exclude_list *el;
};
struct sha1_stat {
struct oid_stat {
struct stat_data stat;
unsigned char sha1[20];
struct object_id oid;
int valid;
};
@ -124,8 +124,8 @@ struct untracked_cache_dir {
};
struct untracked_cache {
struct sha1_stat ss_info_exclude;
struct sha1_stat ss_excludes_file;
struct oid_stat ss_info_exclude;
struct oid_stat ss_excludes_file;
const char *exclude_per_dir;
struct strbuf ident;
/*
@ -195,8 +195,8 @@ struct dir_struct {
/* Enable untracked file cache if set */
struct untracked_cache *untracked;
struct sha1_stat ss_info_exclude;
struct sha1_stat ss_excludes_file;
struct oid_stat ss_info_exclude;
struct oid_stat ss_excludes_file;
unsigned unmanaged_exclude_files;
};