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

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

Hi,

On Mon, 19 Feb 2007, Junio C Hamano wrote:

Show 12 quoted lines

> Linus Torvalds <torvalds@linux-foundation.org> writes:
> 
> > I agree that it is sensible, but it's sensible only within the context of 
> > purely self-generated patches, where the patch itself was generated not 
> > just with git, but with that exact project.
> 
> That makes sense, except that the patch could be made with any
> other tools; it just has to follow the "patch is from the top of
> the tree, with -p1" convention.
> 
> I think it might make sense to change (this might have to be
> read "break", unfortunately) "git apply" for all three cases.

Just for the subdirectory case.

> So the new rule, which would affect only when you run from a 
> subdirectory, would be that "diff -u a/foo b/foo" would be parsed, 1 
> level (or -p <n> levels) of leading paths stripped, and then prefix is 
> added to form "new" and "old" filenames.

Wouldn't it be easier to just cd to the prefix?

> And I think Johannes is happy with that change as well.

Yes, thank you.

Ciao, Dscho