Control: tags -1 + patch

On Mon, Apr 01, 2013 at 12:01:33AM -0700, Jonathan Nieder wrote:
> In the meantime, either of your proposed fixes for cvsimport sounds
> good to me.  Care to try it out and send a patch?

I verified that the attached patch solves this particular issue.

Helmut
Description: Avoid reading /tmp/.gitattributes
Author: Helmut Grohne
Last-Update: 2013-04-03
Bug-Debian: http://bugs.debian.org/704005

git-cvsimport invokes git-hash-object in a way that causes it to read
/tmp/.gitattributes. This patch avoids the behaviour by passing --no-filters to
git-hash-object. An alternative approach would be to put create a temporary
directory call git-hash-object on files withing that private directory.

--- git-cvsimport.orig	2013-04-03 09:53:47.000000000 +0200
+++ git-cvsimport	2013-04-03 09:51:20.000000000 +0200
@@ -1030,7 +1030,7 @@
 			my $pid = open(my $F, '-|');
 			die $! unless defined $pid;
 			if (!$pid) {
-			    exec("git", "hash-object", "-w", $tmpname)
+			    exec("git", "hash-object", "--no-filters", "-w", $tmpname)
 				or die "Cannot create object: $!\n";
 			}
 			my $sha = <$F>;

Reply via email to