summaryrefslogtreecommitdiff
path: root/dir.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-03-18 11:06:15 -0700
committerJunio C Hamano <gitster@pobox.com>2016-03-18 11:06:15 -0700
commit5cee349370bd2dce48d0d653ab4ce99bb79a3415 (patch)
tree382693a846a87b9f1af799a1fdf35b51142757b0 /dir.h
parent8ad3cb08690bdf9a340e47ed4fdb67cbacd1edf2 (diff)
downloadgit-5cee349370bd2dce48d0d653ab4ce99bb79a3415.tar.gz
Revert "Merge branch 'nd/exclusion-regression-fix'"
This reverts commit 5e57f9c3dfe7dd44a1b56bb5b3327d7a1356ec7c, reversing changes made to e79112d21024beb997951381db21a70b087d459d. We will be postponing nd/exclusion-regression-fix topic to later cycle.
Diffstat (limited to 'dir.h')
-rw-r--r--dir.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/dir.h b/dir.h
index 3ec3fb0dca..cd46f30017 100644
--- a/dir.h
+++ b/dir.h
@@ -4,7 +4,6 @@
/* See Documentation/technical/api-directory-listing.txt */
#include "strbuf.h"
-#include "string-list.h"
struct dir_entry {
unsigned int len;
@@ -35,8 +34,6 @@ struct exclude {
* and from -1 decrementing for patterns from CLI args.
*/
int srcpos;
-
- struct string_list sticky_paths;
};
/*