[PATCH] git-cvsimport-script: add "import only" option

git-cvsimport-script: add "import only" option which tells the script
not to perform a checkout after importing.

This ensures that the working directory and cache remain untouched and
will not create them if they do not exist.

Acked-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
index 4eb0f432469797809a2c25171b53a17a5be5725a..05145e93830227ed4bc8079c8b473a6cc8f5c8e0 100644 (file)
--- a/Documentation/git-cvsimport-script.txt
+++ b/Documentation/git-cvsimport-script.txt
@@ -11,7 +11,7 @@ SYNOPSIS
 --------
 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
                        [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]
 --------
 'git-cvsimport-script' [ -o <branch-for-HEAD> ] [ -h ] [ -v ]
                        [ -d <CVSROOT> ] [ -p <options-for-cvsps> ]

-                       [ -C <GIT_repository> ] [ <CVS_module> ]
+                       [ -C <GIT_repository> ] [ -i ] [ <CVS_module> ]

 
 
 DESCRIPTION
 
 
 DESCRIPTION


@@ -29,6 +29,11 @@ OPTIONS
        currently, only the :local:, :ext: and :pserver: access methods 
        are supported.
 
        currently, only the :local:, :ext: and :pserver: access methods 
        are supported.
 

+-i::
+       Import-only: don't perform a checkout after importing.  This option
+       ensures the working directory and cache remain untouched and will
+       not create them if they do not exist.
+

 -o <branch-for-HEAD>::
        The 'HEAD' branch from CVS is imported to the 'origin' branch within
        the git repository, as 'HEAD' already has a special meaning for git.
 -o <branch-for-HEAD>::
        The 'HEAD' branch from CVS is imported to the 'origin' branch within
        the git repository, as 'HEAD' already has a special meaning for git.

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 666de6f09a0c5bd526ec8c526cdfdec15432b580..0ed12ff34b61295d1824f891f2fae3bafc6a4bbe 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";
 
 $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 ]
 
 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);
 }
 
 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();
 usage if $opt_h;
 
 @ARGV <= 1 or usage();


@@ -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;
        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;
 } 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");
                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");
 }
 unlink("$git_dir/CVS2GIT_HEAD");