mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cvsimport: Remove master-updating code

Browse Source 
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>
This commit is contained in:
Matthias Urlichs
2006-03-07 10:08:34 +01:00
committed by Junio C Hamano
parent 2dcdb4c697
commit a541211ef4
2 changed files with 8 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/git-cvsimport.txt
View File

@ -22,6 +22,12 @@ repository, or incrementally import into an existing one.
Splitting the CVS log into patch sets is done by 'cvsps'. Splitting the CVS log into patch sets is done by 'cvsps'.
At least version 2.1 is required. 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 OPTIONS
------- -------
-d <CVSROOT>:: -d <CVSROOT>::

27
git-cvsimport.perl
View File

@ -452,7 +452,6 @@ chdir($git_tree);
my $last_branch = ""; my $last_branch = "";
my $orig_branch = ""; my $orig_branch = "";
my $forward_master = 0;
my %branch_date; my %branch_date;
my $git_dir = $ENV{"GIT_DIR"} || ".git"; my $git_dir = $ENV{"GIT_DIR"} || ".git";
@ -488,21 +487,6 @@ unless(-d $git_dir) {
$last_branch = "master"; $last_branch = "master";
} }
$orig_branch = $last_branch; $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 # populate index
system('git-read-tree', $last_branch); system('git-read-tree', $last_branch);
@ -889,17 +873,11 @@ if (defined $orig_git_index) {
# Now switch back to the branch we were in before all of this happened # Now switch back to the branch we were in before all of this happened
if($orig_branch) { if($orig_branch) {
print "DONE\n" if $opt_v; print "DONE; you may need to merge manually.\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 $?;
}
} else { } else {
$orig_branch = "master"; $orig_branch = "master";
print "DONE; creating $orig_branch branch\n" if $opt_v; 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"; unless -f "$git_dir/refs/heads/master";
system('git-update-ref', 'HEAD', "$orig_branch"); system('git-update-ref', 'HEAD', "$orig_branch");
unless ($opt_i) { unless ($opt_i) {
@ -907,4 +885,3 @@ if($orig_branch) {
die "checkout failed: $?\n" if $?; die "checkout failed: $?\n" if $?;
} }
} }
unlink("$git_dir/CVS2GIT_HEAD");