git-svn: support fetch with autocrlf on

kusma · Eric Wong · commit 402e139c7e30 · 2010-03-05T02:57:57.000-08:00
Before commit d3c9634, performing a "git svn rebase" that fetched a change containing CRLFs corrupted the git-svn meta-data. This was worked around in d3c9634 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>
diff --git 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 {

Original file line number	Diff line number	Diff line change
`@@ -842,7 +842,7 @@ sub _open_hash_and_insert_object_if_needed {`
`842`	`842`
`843`	`843`	`($self->{hash_object_pid}, $self->{hash_object_in},`
`844`	`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`	`846`	`}`
`847`	`847`
`848`	`848`	`sub _close_hash_and_insert_object {`