Re: [PATCH] Teach 'git apply' to look at $GIT_DIR/config

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 18, 2007, 00:40 UTC
Message-ID: <Pine.LNX.4.63.0702180135240.22628@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To: <7vbqjsqpgs.fsf@assigned-by-dhcp.cox.net>

Hi,

On Sat, 17 Feb 2007, Junio C Hamano wrote:

Show 15 quoted lines

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> 
> >> > If I read this correctly, running 'git apply' inside a git repository
> >> > will parse $GIT_DIR/config and $HOME/.gitconfig. However, outside of a
> >> > repository it will parse neither. It would make more sense to me to
> >> > still parse $HOME/.gitconfig to pick up the user's global options.
> >> 
> >> I thought about that, but decided against it.  If you are truly
> >> operating outside a git managed repository, it does not feel
> >> right to apply configuration user has for git.
> >
> > That is a good point. But in the same vein, why not have a flag to 
> > git-apply, and let it ignore the configuration altogether?
> 
> Do you mean --whitespace=strip option from the command line?

I meant something like "--whitespace=I-know-the-patch-is-sane-but-lets-add-cr-to-all-lfs".

> But I think Jeff is right.  It would make sense to let apply
> and perhaps 'diff', if we can somehow merge 'diff2' into it,
> still read from $HOME/.gitconfig if available.

Yes, especially if you are soo used to colours as I grew to be used to them. This was literally one of the reasons I wrote diff2 in the first place. Another was --color-words.

BTW any good ideas how to make diff fall back to diff2, so that no similar case falls back to diff-index?

I am really wondering if you can have a syntax which Does The Right Thing at all times. Maybe we can teach diff that exactly two arguments, which both exist in the filesystem, and at least one of them is not tracked, then please use diff2? I wonder how often you do something like

	git diff object.c object-refs.c

and how confusing it would be that it could mean two things, diff2 _and_ diff-index?

Ciao, Dscho