From 5cee349370bd2dce48d0d653ab4ce99bb79a3415 Mon Sep 17 00:00:00 2001
From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 18 Mar 2016 11:06:15 -0700
Subject: 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.
---
 dir.h | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'dir.h')

diff --git a/dir.h b/dir.h
index 3ec3fb0dc..cd46f3001 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;
 };
 
 /*
-- 
cgit v1.2.1