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

From: Junio C Hamano <junkio@cox.net>
Date: Feb 20, 2007, 00:35 UTC
Message-ID: <7vps854qf8.fsf@assigned-by-dhcp.cox.net>
In-Reply-To: <Pine.LNX.4.64.0702191601300.20368@woody.linux-foundation.org>

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.

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.

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