From: "Jörn Engel" <joern@logfs.org>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: [PATCH] git-quiltimport.sh: disallow fuzz
Date: Wed, 24 Sep 2014 17:35:12 -0400 [thread overview]
Message-ID: <20140924213512.GA7619@logfs.org> (raw)
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, as it should be by any prudent
person.
Signed-off-by: Joern Engel <joern@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
--
2.1.0
next reply other threads:[~2014-09-24 21:58 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-24 21:35 Jörn Engel [this message]
2014-09-25 5:09 ` [PATCH] git-quiltimport.sh: disallow fuzz Junio C Hamano
2014-09-25 22:08 ` Jörn Engel
2014-09-25 22:48 ` Junio C Hamano
2014-09-25 22:59 ` Junio C Hamano
2014-09-26 21:02 ` Junio C Hamano
2014-10-21 21:32 ` Junio C Hamano
2014-10-21 21:38 ` [PATCH 2/2] git-quiltimport: flip the default not to allow fuzz Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140924213512.GA7619@logfs.org \
--to=joern@logfs.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.