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 3b892f97096d3989a4a1d1b9175a615c2c6df455..50f5d9642a17eef42d9a28e36201a808e655f54f 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -470,6 +470,9 @@ ($$)
 $index{$opt_o} = tmpnam();
 
 $ENV{GIT_INDEX_FILE} = $index{$opt_o};
 $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 $?;
 unless(-d $git_dir) {
        system("git-init-db");
        die "Cannot init the GIT db at $git_tree: $?\n" if $?;


@@ -813,17 +816,15 @@ sub commit {
                        unless ($index{$branch}) {
                            $index{$branch} = tmpnam();
                            $ENV{GIT_INDEX_FILE} = $index{$branch};
                        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) {
                        if ($ancestor) {

+                           print "have ancestor $ancestor" if $opt_v;

                            system("git-read-tree", $ancestor);
                            die "read-tree failed: $?\n" if $?;
                            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
                        }
                } else {
                        # just in case