@matheusbsbs / matheus-bagliano / commits / 402e139c7e
Fork 0

git-svn: support fetch with autocrlf on

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> Acked-by: Eric Wong <normalperson@yhbt.net>

Erik Faye-Lund committed Mar 3, 2010 at 21:10 UTC 402e139c7e30eb95312aeafdc1a9e8e8167c14cb
1 file changed +1 -1
perl/Git.pm
+1 -1
@@ -842,7 +842,7 @@ sub _open_hash_and_insert_object_if_needed {
842
843 ($self->{hash_object_pid}, $self->{hash_object_in},
844 $self->{hash_object_out}, $self->{hash_object_ctx}) =
845 - command_bidi_pipe(qw(hash-object -w --stdin-paths));
845 + command_bidi_pipe(qw(hash-object -w --stdin-paths --no-filters));
846 }
847
848 sub _close_hash_and_insert_object {