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

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

Linus Torvalds <torvalds@linux-foundation.org> writes:

Show 5 quoted lines

> We could just make "parse_traditional_patch()" try to take the prefix 
> information into account instead. That would be a better choice than doing 
> it unconditionally even for native git patches.
>
> Junio?

I guess I took your suggestion too literally while being blinded by the thought to make things consistent.

Show 11 quoted lines

>> I _think_ that the right answer is to (a) yes, make it be consistent, but 
>> (b) _not_ make it be the way we do "--index" now.
>>
>> Right now, when we see "--index", we do the "setup_git_directory()" and 
>> the git_config() stuff - which is (I think) something we should always do, 
>> but then we do *not* prefix the patch itself with the prefix we got. And I 
>> think that's wrong. I think we should always do the "-p1" behaviour from 
>> where we started.
>
>Hmm.  I am puzzled.  Are you suggesting to change behaviour of
>"git apply" with --index?

We can (and should) obviously do different things depending on "diff --git". Let me see.