summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorbrian m. carlson <sandals@crustytoothpaste.net>2018-05-02 00:25:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-02 04:59:51 (GMT)
commit70c369cde064375483917f4874a6e5670ef48164 (patch)
tree03984c960748a94bbb7eac2c57b8924bdce42df2 /dir.h
parent26ea3e7dca42266faa74f2080d28ecdd832d011d (diff)
downloadgit-70c369cde064375483917f4874a6e5670ef48164.zip
git-70c369cde064375483917f4874a6e5670ef48164.tar.gz
git-70c369cde064375483917f4874a6e5670ef48164.tar.bz2
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 <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/dir.h b/dir.h
index b0758b8..de66be9 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];
};