Merge branch 'jc/cvsimport' into next
* jc/cvsimport: cvsimport: fix reading from rev-parsemaint
commit
c534c4ba7e
|
@ -881,6 +881,7 @@ if($orig_branch) {
|
||||||
}
|
}
|
||||||
my $tip_at_end = `git-rev-parse --verify HEAD`;
|
my $tip_at_end = `git-rev-parse --verify HEAD`;
|
||||||
if ($tip_at_start ne $tip_at_end) {
|
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;
|
print "Fetched into the current branch.\n" if $opt_v;
|
||||||
system(qw(git-read-tree -u -m),
|
system(qw(git-read-tree -u -m),
|
||||||
$tip_at_start, $tip_at_end);
|
$tip_at_start, $tip_at_end);
|
||||||
|
|
Loading…
Reference in New Issue