how do I ignore a directory for diff

how do I ignore a directory for diff

[LongChair .]

Hello,

I have been looking into ignoring a subdirectory of my tree for diffing with upstream.
I'll explain the situation below :

My tree is a fork of an upstream repo.
There is a specific directory in my tree lets call it foo/bar that i would like to ignore for diff. This directory includes only files that i added to my repo and is therefore irrelevant for diffing (i know all files in there have been added and are not in upstream). Having there in the diff is just making a lot of files to appear and that is confusing to see what is changed from upstream.

I have read the docs and found a way mentioning that i should add a line to .gitattributes with :
foo/bar/* -diff

But this still lists the files in there when i'm diffing.

Is there any way to achieve this ? i cant find any clear explanation in the docs.

Any help would be greatly appreciated :)

Lionel.

 		 	   		  

Re: how do I ignore a directory for diff

[John Keeping]

On Sun, Apr 05, 2015 at 11:31:54AM +0000, LongChair . wrote:
> I have been looking into ignoring a subdirectory of my tree for
> diffing with upstream.  I'll explain the situation below :
> 
> My tree is a fork of an upstream repo.  There is a specific directory
> in my tree lets call it foo/bar that i would like to ignore for diff.
> This directory includes only files that i added to my repo and is
> therefore irrelevant for diffing (i know all files in there have been
> added and are not in upstream). Having there in the diff is just
> making a lot of files to appear and that is confusing to see what is
> changed from upstream.
> 
> I have read the docs and found a way mentioning that i should add a
> line to .gitattributes with : foo/bar/* -diff
> 
> But this still lists the files in there when i'm diffing.
> 
> Is there any way to achieve this ? i cant find any clear explanation
> in the docs.

Since git-diff takes a pathspec you can use the exclude magic to exclude
certain directories like this:

	git diff upstream -- ':(top)' ':(exclude)foo/bar'

or equivalently:

	git diff upstream -- :/ ':!foo/bar'

The documentation for the pathspec syntax is in git-glossary(7).

Re: how do I ignore a directory for diff

[Lionel CHAZALLON]

Hello John,

Thanks for the answer. I am also using some GUI client (smartgit). Is there any way to make this part of the repo attributes / configuration so that my git GUI would use it ? 

Lionel.

> Le 5 avr. 2015 à 14:17, John Keeping <john@keeping.me.uk> a écrit :
> 
> On Sun, Apr 05, 2015 at 11:31:54AM +0000, LongChair . wrote:
>> I have been looking into ignoring a subdirectory of my tree for
>> diffing with upstream.  I'll explain the situation below :
>> 
>> My tree is a fork of an upstream repo.  There is a specific directory
>> in my tree lets call it foo/bar that i would like to ignore for diff.
>> This directory includes only files that i added to my repo and is
>> therefore irrelevant for diffing (i know all files in there have been
>> added and are not in upstream). Having there in the diff is just
>> making a lot of files to appear and that is confusing to see what is
>> changed from upstream.
>> 
>> I have read the docs and found a way mentioning that i should add a
>> line to .gitattributes with : foo/bar/* -diff
>> 
>> But this still lists the files in there when i'm diffing.
>> 
>> Is there any way to achieve this ? i cant find any clear explanation
>> in the docs.
> 
> Since git-diff takes a pathspec you can use the exclude magic to exclude
> certain directories like this:
> 
> 	git diff upstream -- ':(top)' ':(exclude)foo/bar'
> 
> or equivalently:
> 
> 	git diff upstream -- :/ ':!foo/bar'
> 
> The documentation for the pathspec syntax is in git-glossary(7).

Re: how do I ignore a directory for diff

[John Keeping]

On Sun, Apr 05, 2015 at 04:19:50PM +0200, Lionel CHAZALLON wrote:
> > Le 5 avr. 2015 à 14:17, John Keeping <john@keeping.me.uk> a écrit :
> > 
> > On Sun, Apr 05, 2015 at 11:31:54AM +0000, LongChair . wrote:
> >> I have been looking into ignoring a subdirectory of my tree for
> >> diffing with upstream.  I'll explain the situation below :
> >> 
> >> My tree is a fork of an upstream repo.  There is a specific directory
> >> in my tree lets call it foo/bar that i would like to ignore for diff.
> >> This directory includes only files that i added to my repo and is
> >> therefore irrelevant for diffing (i know all files in there have been
> >> added and are not in upstream). Having there in the diff is just
> >> making a lot of files to appear and that is confusing to see what is
> >> changed from upstream.
> >> 
> >> I have read the docs and found a way mentioning that i should add a
> >> line to .gitattributes with : foo/bar/* -diff
> >> 
> >> But this still lists the files in there when i'm diffing.
> >> 
> >> Is there any way to achieve this ? i cant find any clear explanation
> >> in the docs.
> > 
> > Since git-diff takes a pathspec you can use the exclude magic to exclude
> > certain directories like this:
> > 
> > 	git diff upstream -- ':(top)' ':(exclude)foo/bar'
> > 
> > or equivalently:
> > 
> > 	git diff upstream -- :/ ':!foo/bar'
> > 
> > The documentation for the pathspec syntax is in git-glossary(7).
> 
> Thanks for the answer. I am also using some GUI client (smartgit). Is
> there any way to make this part of the repo attributes / configuration
> so that my git GUI would use it ? 

I think you'll have to file a feature request with SmartGit if you want
support for this in their UI.

The standard way to set this up would be to create an alias that does
what you want, such as:

	git config alias.d 'diff -- :/ ":!foo/bar"'

and use "git d" instead of "git diff", but there is no way for other
programs to inherit that.