cvsimport: Remove master-updating code

The code which tried to update the master branch was somewhat broken.
=> People should do that manually, with "git merge".

Signed-off-by: Matthias Urlichs <smurf@smurf.noris.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt
index dfe86ceea3ac54306e3be23f7f7b53b1ca8a3a37..57027b448f52a1357d89b569f5b94c8a928f7f56 100644 (file)
--- a/Documentation/git-cvsimport.txt
+++ b/Documentation/git-cvsimport.txt
@@ -22,6 +22,12 @@ repository, or incrementally import into an existing one.
 Splitting the CVS log into patch sets is done by 'cvsps'.
 At least version 2.1 is required.
 
 Splitting the CVS log into patch sets is done by 'cvsps'.
 At least version 2.1 is required.
 

+You should *never* do any work of your own on the branches that are
+created by git-cvsimport. The initial import will create and populate a
+"master" branch from the CVS repository's main branch which you're free
+to work with; after that, you need to 'git merge' incremental imports, or
+any CVS branches, yourself.
+

 OPTIONS
 -------
 -d <CVSROOT>::
 OPTIONS
 -------
 -d <CVSROOT>::

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index b46469ab32fa5707c8056c5a32db61d7c268e50b..02d1928ada5001d938a549bd9a33acd4b9c0f074 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -452,7 +452,6 @@ ($$)
 
 my $last_branch = "";
 my $orig_branch = "";
 
 my $last_branch = "";
 my $orig_branch = "";

-my $forward_master = 0;

 my %branch_date;
 
 my $git_dir = $ENV{"GIT_DIR"} || ".git";
 my %branch_date;
 
 my $git_dir = $ENV{"GIT_DIR"} || ".git";


@@ -488,21 +487,6 @@ ($$)
                $last_branch = "master";
        }
        $orig_branch = $last_branch;
                $last_branch = "master";
        }
        $orig_branch = $last_branch;

-       if (-f "$git_dir/CVS2GIT_HEAD") {
-               die <<EOM;
-CVS2GIT_HEAD exists.
-Make sure your working directory corresponds to HEAD and remove CVS2GIT_HEAD.
-You may need to run
-
-    git read-tree -m -u CVS2GIT_HEAD HEAD
-EOM
-       }
-       system('cp', "$git_dir/HEAD", "$git_dir/CVS2GIT_HEAD");
-
-       $forward_master =
-           $opt_o ne 'master' && -f "$git_dir/refs/heads/master" &&
-           system('cmp', '-s', "$git_dir/refs/heads/master", 
-                               "$git_dir/refs/heads/$opt_o") == 0;

 
        # populate index
        system('git-read-tree', $last_branch);
 
        # populate index
        system('git-read-tree', $last_branch);


@@ -889,17 +873,11 @@ ($$)
 
 # Now switch back to the branch we were in before all of this happened
 if($orig_branch) {
 
 # Now switch back to the branch we were in before all of this happened
 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;
-       unless ($opt_i) {
-               system('git-read-tree', '-m', '-u', 'CVS2GIT_HEAD', 'HEAD');
-               die "read-tree failed: $?\n" if $?;
-       }
+       print "DONE; you may need to merge manually.\n" if $opt_v;

 } 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;

-       system("cp","$git_dir/refs/heads/$opt_o","$git_dir/refs/heads/master")
+       system("git-update-ref", "refs/heads/master", "refs/heads/$opt_o")

                unless -f "$git_dir/refs/heads/master";
        system('git-update-ref', 'HEAD', "$orig_branch");
        unless ($opt_i) {
                unless -f "$git_dir/refs/heads/master";
        system('git-update-ref', 'HEAD', "$orig_branch");
        unless ($opt_i) {


@@ -907,4 +885,3 @@ ($$)
                die "checkout failed: $?\n" if $?;
        }
 }
                die "checkout failed: $?\n" if $?;
        }
 }

-unlink("$git_dir/CVS2GIT_HEAD");