git-tag-script updates.

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 666de6f09a0c5bd526ec8c526cdfdec15432b580..8f57396c2d815a4209e5b52cfb82465d100c4069 100755 (executable)
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -28,19 +28,19 @@ use POSIX qw(strftime dup2);
 $SIG{'PIPE'}="IGNORE";
 $ENV{'TZ'}="UTC";
 
-our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C,$opt_z);
+our($opt_h,$opt_o,$opt_v,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i);
 
 sub usage() {
        print STDERR <<END;
 Usage: ${\basename $0}     # fetch/update GIT from CVS
        [ -o branch-for-HEAD ] [ -h ] [ -v ] [ -d CVSROOT ]
        [ -p opts-for-cvsps ] [ -C GIT_repository ] [ -z fuzz ]
-       [ CVS_module ]
+       [ -i ] [ CVS_module ]
 END
        exit(1);
 }
 
-getopts("hvo:d:p:C:z:") or usage();
+getopts("hivo:d:p:C:z:") or usage();
 usage if $opt_h;
 
 @ARGV <= 1 or usage();
@@ -675,7 +675,7 @@ while(<CVS>) {
                $state = 9;
        } elsif($state == 8) {
                $logmsg .= "$_\n";
-       } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
+       } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
 #      VERSION:1.96->1.96.2.1
                my $init = ($2 eq "INITIAL");
                my $fn = $1;
@@ -723,8 +723,10 @@ if($orig_branch) {
        print "DONE\n" if $opt_v;
        system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
                if $forward_master;
-       system('git-read-tree', '-m', '-u', 'CVS2GIT_HEAD', 'HEAD');
-       die "read-tree failed: $?\n" if $?;
+       unless ($opt_i) {
+               system('git-read-tree', '-m', '-u', 'CVS2GIT_HEAD', 'HEAD');
+               die "read-tree failed: $?\n" if $?;
+       }
 } else {
        $orig_branch = "master";
        print "DONE; creating $orig_branch branch\n" if $opt_v;
@@ -732,7 +734,9 @@ if($orig_branch) {
                unless -f "$git_dir/refs/heads/master";
        unlink("$git_dir/HEAD");
        symlink("refs/heads/$orig_branch","$git_dir/HEAD");
-       system('git checkout');
-       die "checkout failed: $?\n" if $?;
+       unless ($opt_i) {
+               system('git checkout');
+               die "checkout failed: $?\n" if $?;
+       }
 }
 unlink("$git_dir/CVS2GIT_HEAD");