From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Date: Sat, 24 Jun 2006 19:42:20 +0000 (+0200)
Subject: cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}
X-Git-Tag: v1.4.1-rc2~20^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=061303f0b50a648db8e0af23791fc56181f6bf93;p=git.git

cvsimport: always set $ENV{GIT_INDEX_FILE} to $index{$branch}

Also, make sure that the initial git-read-tree is performed.

Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3b892f970..50f5d9642 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -470,6 +470,9 @@ my %index; # holds filenames of one index per branch
 $index{$opt_o} = tmpnam();
 
 $ENV{GIT_INDEX_FILE} = $index{$opt_o};
+system("git-read-tree", $opt_o);
+die "read-tree failed: $?\n" if $?;
+
 unless(-d $git_dir) {
 	system("git-init-db");
 	die "Cannot init the GIT db at $git_tree: $?\n" if $?;
@@ -813,17 +816,15 @@ while(<CVS>) {
 			unless ($index{$branch}) {
 			    $index{$branch} = tmpnam();
 			    $ENV{GIT_INDEX_FILE} = $index{$branch};
+			    system("git-read-tree", $branch);
+			    die "read-tree failed: $?\n" if $?;
 			}
+			# just in case
+			$ENV{GIT_INDEX_FILE} = $index{$branch};
 			if ($ancestor) {
+			    print "have ancestor $ancestor" if $opt_v;
 			    system("git-read-tree", $ancestor);
 			    die "read-tree failed: $?\n" if $?;
-			} else {
-			    unless ($index{$branch}) {
-				$index{$branch} = tmpnam();
-				$ENV{GIT_INDEX_FILE} = $index{$branch};
-				system("git-read-tree", $branch);
-				die "read-tree failed: $?\n" if $?;
-			    }
 			}
 		} else {
 			# just in case