Thread (9 messages) flat view 9 messages, 5 authors, 2016-06-15

Re: 1.8.3 - gitignore not being parsed correctly on OS X; regex support is broken?

From: Øystein Walle <hidden>
Date: 2016-06-15 22:57:29

Karsten Blees <karsten.blees <at> gmail.com> writes:
 <at> Øystein: in the meantime, could you check if this fixes the problem 
for you?
quoted hunk ↗ jump to hunk
--- 8< ---
diff --git a/dir.c b/dir.c
index a5926fb..13858fe 100644
--- a/dir.c
+++ b/dir.c
 <at>  <at>  -821,6 +821,9  <at>  <at>  static void prep_exclude(struct 
dir_struct *dir, const char *base, int baselen)
 				dir->basebuf, stk->baselen - 1,
 				dir->basebuf + current, &dt);
 			dir->basebuf[stk->baselen - 1] = '/';
+			if (dir->exclude &&
+			    dir->exclude->flags & EXC_FLAG_NEGATIVE)
+				dir->exclude = NULL;
 			if (dir->exclude) {
 				dir->basebuf[stk->baselen] = 0;
 				dir->exclude_stack = stk;
Hi, Karsten

I applied your fix on v1.8.3 on both systems I mentioned earlier and
from my tests the issue I reported is fixed.

Thank you very much! :)

Regards
Øsse
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help