Re: bug?: git grep HEAD with exclude in pathspec not taken into account
On Wed, Oct 24, 2018 at 4:55 PM Christophe Bliard wrote: > > Hi, > > I observed an unexpected behavior while using git grep with both git > 2.19.1 and 2.14.3. Quick note. I confirm this is a bug in tree_entry_interesting() perhaps being over-optimistic. It'll take me more time to familiarize myself with this negative matching in the function before I come up with a fix for it. Thanks for reporting. -- Duy
Re: bug?: git grep HEAD with exclude in pathspec not taken into account
In fact, per https://github.com/git/git/commit/859b7f1d0e742493d2a9396794cd9040213ad846, having only a negative pattern is like having a catch-all positive pattern and the negative pattern (since git 2.13.0). Thus, adding the positive pattern yields the same results: > git --no-pager grep foo HEAD -- ':!fileA' . HEAD:fileB:foo is false+ > git --no-pager grep foo HEAD -- ':!fileB' . HEAD:fileA:foo HEAD:fileB:foo is false+ Le mer. 24 oct. 2018 à 17:14, Duy Nguyen a écrit : > > On Wed, Oct 24, 2018 at 4:55 PM Christophe Bliard > wrote: > > > > Hi, > > > > I observed an unexpected behavior while using git grep with both git > > 2.19.1 and 2.14.3. Here is how to reproduce it: > > > > > git init > > Initialized empty Git repository in /private/tmp/hello/.git/ > > > echo foo > fileA > > > echo 'foo is false+' > fileB > > > git add fileA > > > git commit -m fileA > > [master (root-commit) f2c83e7] fileA > > 1 file changed, 1 insertion(+) > > create mode 100644 fileA > > > git add fileB > > > git commit -m fileB > > [master e35df26] fileB > > 1 file changed, 1 insertion(+) > > create mode 100644 fileB > > > git --no-pager grep foo HEAD -- ':!fileA' > > HEAD:fileB:foo is false+ > > > git --no-pager grep foo HEAD -- ':!fileB' > > HEAD:fileA:foo > > HEAD:fileB:foo is false+ > > > > In the last command, fileB appears in grep results but it should have > > been excluded. > > > > If the HEAD parameter is removed, it works as expected: > > It's probably a bug. We have different code paths for matching things > with or without HEAD, roughly speaking. I'll look into to this more on > the weekend, unless somebody (is welcome to) beats me first. > > Another thing that might also be a problem is, negative patterns are > supposed to exclude stuff from "something" but you don't specify that > "something" (i.e. positive patterns) in your grep commands above. If > "grep foo HEAD -- :/ ':!fileB'" works, then you probably just run into > some undefined corner case. > -- > Duy
Re: bug?: git grep HEAD with exclude in pathspec not taken into account
On Wed, Oct 24, 2018 at 4:55 PM Christophe Bliard wrote: > > Hi, > > I observed an unexpected behavior while using git grep with both git > 2.19.1 and 2.14.3. Here is how to reproduce it: > > > git init > Initialized empty Git repository in /private/tmp/hello/.git/ > > echo foo > fileA > > echo 'foo is false+' > fileB > > git add fileA > > git commit -m fileA > [master (root-commit) f2c83e7] fileA > 1 file changed, 1 insertion(+) > create mode 100644 fileA > > git add fileB > > git commit -m fileB > [master e35df26] fileB > 1 file changed, 1 insertion(+) > create mode 100644 fileB > > git --no-pager grep foo HEAD -- ':!fileA' > HEAD:fileB:foo is false+ > > git --no-pager grep foo HEAD -- ':!fileB' > HEAD:fileA:foo > HEAD:fileB:foo is false+ > > In the last command, fileB appears in grep results but it should have > been excluded. > > If the HEAD parameter is removed, it works as expected: It's probably a bug. We have different code paths for matching things with or without HEAD, roughly speaking. I'll look into to this more on the weekend, unless somebody (is welcome to) beats me first. Another thing that might also be a problem is, negative patterns are supposed to exclude stuff from "something" but you don't specify that "something" (i.e. positive patterns) in your grep commands above. If "grep foo HEAD -- :/ ':!fileB'" works, then you probably just run into some undefined corner case. -- Duy
Re: bug?: git grep HEAD with exclude in pathspec not taken into account
Hi, I observed an unexpected behavior while using git grep with both git 2.19.1 and 2.14.3. Here is how to reproduce it: > git init Initialized empty Git repository in /private/tmp/hello/.git/ > echo foo > fileA > echo 'foo is false+' > fileB > git add fileA > git commit -m fileA [master (root-commit) f2c83e7] fileA 1 file changed, 1 insertion(+) create mode 100644 fileA > git add fileB > git commit -m fileB [master e35df26] fileB 1 file changed, 1 insertion(+) create mode 100644 fileB > git --no-pager grep foo HEAD -- ':!fileA' HEAD:fileB:foo is false+ > git --no-pager grep foo HEAD -- ':!fileB' HEAD:fileA:foo HEAD:fileB:foo is false+ In the last command, fileB appears in grep results but it should have been excluded. If the HEAD parameter is removed, it works as expected: > git --no-pager grep foo -- ':!fileB' fileA:foo If giving the revision, it does not work either > git --no-pager grep foo e35df26 -- ':!fileB' e35df26:fileA:foo e35df26:fileB:foo is false+ The same behavior can be seen with git archive: > git archive --verbose master ':(top)' fileA fileB pax_global_header66600064133641017230014512gustar00rootroot0052 comment=e35df26c65f3c0b303e78743496598b8b6a566e9 fileA66441336410172300120130ustar00rootroot00foo fileB664000161336410172300120170ustar00rootroot00foo is false+ > /usr/local/bin/git archive --verbose master ':(top)' ':(exclude)fileA' fileB pax_global_header66600064133641017230014512gustar00rootroot0052 comment=e35df26c65f3c0b303e78743496598b8b6a566e9 fileB664000161336410172300120170ustar00rootroot00foo is false+ > /usr/local/bin/git archive --verbose master ':(top)' ':(exclude)fileB' fileA fileB pax_global_header66600064133641017230014512gustar00rootroot0052 comment=e35df26c65f3c0b303e78743496598b8b6a566e9 fileA66441336410172300120130ustar00rootroot00foo fileB664000161336410172300120170ustar00rootroot00foo is false+ fileA can be excluded, but not fileB. Is it a bug? Thanks -- Christophe Bliard
