Jörn Engel <jo...@logfs.org> writes:
> git-quiltimport passed "-C1" to git-apply, supposedly to roughly match
> the quilt default of --fuzz 2. This is against the spirit of git.
> Quoting Linus:
> Except unlike the standard "patch" program, "git apply" doesn't accept
> fuzz by default (which to me is a huge deal - I hate how "patch" tries
> to apply stuff that clearly isn't valid any more)
>
> It also causes active harm when combining git-quiltimport with regular
> quilt and quilt is used with --fuzz=0,...
This is fine for those who use quilt with --fuzz=0, but how are you
helping those who use quilt without --fuzz=0?
I agree that unconditionally passing -C1 is a bad thing, but
unconditionally passing -C2 is not that better. Shouldn't this be
done by introducing a new --fuzz=<number> option to quiltimport?
>
> Signed-off-by: Joern Engel <jo...@logfs.org>
> ---
> git-quiltimport.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/git-quiltimport.sh b/git-quiltimport.sh
> index 167d79fea809..3eb2e2fd3648 100755
> --- a/git-quiltimport.sh
> +++ b/git-quiltimport.sh
> @@ -130,7 +130,7 @@ do
> fi
>
> if [ -z "$dry_run" ] ; then
> - git apply --index -C1 ${level:+"$level"} "$tmp_patch" &&
> + git apply --index ${level:+"$level"} "$tmp_patch" &&
> tree=$(git write-tree) &&
> commit=$( (echo "$SUBJECT"; echo; cat "$tmp_msg") | git
> commit-tree $tree -p $commit) &&
> git update-ref -m "quiltimport: $patch_name" HEAD $commit ||
> exit 4
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
