undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jc/cvsimport' into next

Browse Source 
* jc/cvsimport:
  cvsimport: honor -i and non -i upon subsequent imports
This commit is contained in:
Junio C Hamano 2006-03-17 14:11:17 -08:00
commit 8d707b6293
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
git-cvsimport.perl
View File

@ -453,6 +453,7 @@ chdir($git_tree);
my $last_branch = ""; my $last_branch = "";
my $orig_branch = ""; my $orig_branch = "";
my %branch_date; my %branch_date;
my $tip_at_start = undef;
my $git_dir = $ENV{"GIT_DIR"} || ".git"; my $git_dir = $ENV{"GIT_DIR"} || ".git";
$git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#; $git_dir = getwd()."/".$git_dir unless $git_dir =~ m#^/#;
@ -487,6 +488,7 @@ unless(-d $git_dir) {
$last_branch = "master"; $last_branch = "master";
} }
$orig_branch = $last_branch; $orig_branch = $last_branch;
$tip_at_start = `git-rev-parse --verify HEAD`;
# populate index # populate index
system('git-read-tree', $last_branch); system('git-read-tree', $last_branch);
@ -873,7 +875,21 @@ 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; you may need to merge manually.\n" if $opt_v; print "DONE.\n" if $opt_v;
if ($opt_i) {
exit 0;
}
my $tip_at_end = `git-rev-parse --verify HEAD`;
if ($tip_at_start ne $tip_at_end) {
print "Fetched into the current branch.\n" if $opt_v;
system(qw(git-read-tree -u -m),
$tip_at_start, $tip_at_end);
die "Fast-forward update failed: $?\n" if $?;
}
else {
system(qw(git-merge cvsimport HEAD), "refs/heads/$opt_o");
die "Could not merge $opt_o into the current branch.\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;