Re: [Quilt-dev] Re: being nice to patch(1)

From: Andreas Gruenbacher <agruen@suse.de>
Date: Jul 3, 2007, 13:34 UTC
Message-ID: <200707031534.47004.agruen@suse.de>
In-Reply-To: <alpine.LFD.0.98.0707021713200.9434@woody.linux-foundation.org>

On Tuesday 03 July 2007 02:28, Linus Torvalds wrote:

Show 9 quoted lines

> So I would suggest that in quilt and other systems, you either:
>
>  - strip all headers manually
>
>  - forget about "patch", and use "git-apply" instead that does things
>    right and doesn't screw up like this (and can do rename diffs etc too).
>
> I guess the second choice generally isn't an option, but dammit,
> "git-apply" really is the better program here.

I'm in bit of a conflict with choice one: when applying patches in an automated build process or similar, the likely way to do so is a simple loop over the series file. So the less magic when applying patches with quilt, the better.

Turning off the insane heuristic with patch -u will do well enough I hope. Quilt does not use that option by default because it also supports context diffs (some people / projects prefer them), but that can easily be customized in .quiltrc:

    QUILT_PATCH_OPTS=-u

Andreas