Re: [PATCH v2] Do not show "diff --git" metainfo with --no-prefix

From: Daniel Barkalow <barkalow@iabervon.org>
Date: Jan 16, 2008, 04:04 UTC
Message-ID: <alpine.LNX.1.00.0801152256480.13593@iabervon.org>
In-Reply-To: <alpine.LFD.1.00.0801151919440.2806@woody.linux-foundation.org>

On Tue, 15 Jan 2008, Linus Torvalds wrote:

Show 15 quoted lines

> On Tue, 15 Jan 2008, Linus Torvalds wrote:
> > 
> > If we do any git-specific stuff, we need to have that "--git" thing there. 
> > That is *not* just limited to the prefix, but to all the other things git 
> > diffs can do: renames, mode changes, etc.
> 
> Side note: the fact that git-apply itself might have issues with a 
> "--no-prefix" patch is really a red herring, because while it's true that 
> you would normally not do it for git, it's even more true that we haven't 
> actually started teaching git about it and the cases where you *would* use 
> it (eg recursive subproject diffs etc).
>
> So I do not think it's true that "--no-prefix" (or --src/dst-prefix) 
> necessarily implies "no-git" at all. It *can* do so, but it's not a given 
> thing, and almost certainly isn't in the long run with submodule support.

I don't think --no-prefix is sufficient for submodules; it means that git-apply will accidentally remove exactly one level, but if your submodule is two directory levels down, it won't work, and having the effective prefixes be "gitweb" and "gitweb" is a little hackish. You'd really want to generate a -p1 patch whose root is shifted from the actual project root, not a -p0 patch or -p2 patch or something.

	-Daniel
*This .sig left intentionally blank*