From 70c369cde064375483917f4874a6e5670ef48164 Mon Sep 17 00:00:00 2001 From: "brian m. carlson" Date: Wed, 2 May 2018 00:25:48 +0000 Subject: dir: convert struct untracked_cache_dir to object_id Convert the exclude_sha1 member of struct untracked_cache_dir and rename it to exclude_oid. Eliminate several hard-coded integral constants, and update a function name that referred to SHA-1. Signed-off-by: brian m. carlson Signed-off-by: Junio C Hamano --- dir.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'dir.h') diff --git a/dir.h b/dir.h index b0758b82a2..de66be9f4e 100644 --- a/dir.h +++ b/dir.h @@ -3,6 +3,7 @@ /* See Documentation/technical/api-directory-listing.txt */ +#include "cache.h" #include "strbuf.h" struct dir_entry { @@ -118,8 +119,8 @@ struct untracked_cache_dir { /* all data except 'dirs' in this struct are good */ unsigned int valid : 1; unsigned int recurse : 1; - /* null SHA-1 means this directory does not have .gitignore */ - unsigned char exclude_sha1[20]; + /* null object ID means this directory does not have .gitignore */ + struct object_id exclude_oid; char name[FLEX_ARRAY]; }; -- cgit v1.2.3