From: Erik Faye-Lund <kusmabite@googlemail.com>
To: git@vger.kernel.org
Cc: normalperson@yhbt.net, dpotapov@gmail.com
Subject: [PATCH 2/3] git-svn: support fetch with autocrlf on
Date: Wed, 3 Mar 2010 21:10:22 +0100 [thread overview]
Message-ID: <1267647023-2604-2-git-send-email-kusmabite@gmail.com> (raw)
In-Reply-To: <1267647023-2604-1-git-send-email-kusmabite@gmail.com>
Before commit d3c9634e, performing a "git svn rebase" that fetched a
change containing CRLFs corrupted the git-svn meta-data. This was
worked around in d3c9634e by setting core.autocrlf to "false" in the
per-repo config when initing the clone. However, if the config
variable was later changed, the corruption would still occur.
This patch tries to fix it while allowing core.autocrlf to be
enabled, by disabling filters when when hashing.
git-svn is currently the only call-site for hash_and_insert_object
(apart from the test-suite), so changing it should be safe.
Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com>
---
perl/Git.pm | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/perl/Git.pm b/perl/Git.pm
index 970fe43..1926dc9 100644
--- a/perl/Git.pm
+++ b/perl/Git.pm
@@ -842,7 +842,7 @@ sub _open_hash_and_insert_object_if_needed {
($self->{hash_object_pid}, $self->{hash_object_in},
$self->{hash_object_out}, $self->{hash_object_ctx}) =
- command_bidi_pipe(qw(hash-object -w --stdin-paths));
+ command_bidi_pipe(qw(hash-object -w --stdin-paths --no-filters));
}
sub _close_hash_and_insert_object {
--
1.7.0.1.141.gc5984a
next prev parent reply other threads:[~2010-03-03 20:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-03 20:10 [PATCH 1/3] hash-object: support --stdin-paths with --no-filters Erik Faye-Lund
2010-03-03 20:10 ` Erik Faye-Lund [this message]
2010-03-03 20:10 ` [PATCH 3/3] Revert "git-svn: always initialize with core.autocrlf=false" Erik Faye-Lund
2010-03-03 20:16 ` Erik Faye-Lund
2010-03-04 9:53 ` Eric Wong
2010-03-04 10:24 ` Erik Faye-Lund
2010-03-04 14:35 ` [PATCH 1/3] hash-object: support --stdin-paths with --no-filters Dmitry Potapov
2010-03-04 18:11 ` Junio C Hamano
2010-03-05 11:05 ` Eric Wong
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=1267647023-2604-2-git-send-email-kusmabite@gmail.com \
--to=kusmabite@googlemail.com \
--cc=dpotapov@gmail.com \
--cc=git@vger.kernel.org \
--cc=normalperson@yhbt.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).