Browse Source

Merge branch 'jc/cvsimport' into next

* jc/cvsimport:
  cvsimport: fix reading from rev-parse
maint
Junio C Hamano 19 years ago
parent
commit
c534c4ba7e
  1. 1
      git-cvsimport.perl

1
git-cvsimport.perl

@ -881,6 +881,7 @@ if($orig_branch) { @@ -881,6 +881,7 @@ if($orig_branch) {
}
my $tip_at_end = `git-rev-parse --verify HEAD`;
if ($tip_at_start ne $tip_at_end) {
for ($tip_at_start, $tip_at_end) { chomp; }
print "Fetched into the current branch.\n" if $opt_v;
system(qw(git-read-tree -u -m),
$tip_at_start, $tip_at_end);

Loading…
Cancel
Save