diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-02-15 22:55:43 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-02-15 22:55:43 (GMT) |
commit | 8be8342b4c47df386c6eced39922595d7dfdccc9 (patch) | |
tree | 3fed16dd1602125435cf12a4c150698bb13bdf59 /dir.h | |
parent | 157ee050615192d579a358723563e7f785d676ff (diff) | |
parent | 1752cbbc447c08230c478239e185db9fa2d4a515 (diff) | |
download | git-8be8342b4c47df386c6eced39922595d7dfdccc9.zip git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.gz git-8be8342b4c47df386c6eced39922595d7dfdccc9.tar.bz2 |
Merge branch 'po/object-id'
Conversion from uchar[20] to struct object_id continues.
* po/object-id:
sha1_file: rename hash_sha1_file_literally
sha1_file: convert write_loose_object to object_id
sha1_file: convert force_object_loose to object_id
sha1_file: convert write_sha1_file to object_id
notes: convert write_notes_tree to object_id
notes: convert combine_notes_* to object_id
commit: convert commit_tree* to object_id
match-trees: convert splice_tree to object_id
cache: clear whole hash buffer with oidclr
sha1_file: convert hash_sha1_file to object_id
dir: convert struct sha1_stat to use object_id
sha1_file: convert pretend_sha1_file to object_id
Diffstat (limited to 'dir.h')
-rw-r--r-- | dir.h | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -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; }; |