X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=git-cvsimport.perl;h=bdac5d51b6dfb721bb648e455cb8f3c5078217e4;hb=6304c29d518206b0780291a02f94f435abf82d74;hp=47f116f37ee1030ac0cab1f91feec04d673d94bd;hpb=5c9afcff1aa048abf95296231d51fa481304a735;p=git.git diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 47f116f37..bdac5d51b 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -735,7 +735,7 @@ sub commit { next unless $logmsg =~ $rx && $1; my $mparent = $1 eq 'HEAD' ? $opt_o : $1; if (my $sha1 = get_headref("$remote/$mparent")) { - push @commit_args, '-p', $mparent; + push @commit_args, '-p', "$remote/$mparent"; print "Merge parent branch: $mparent\n" if $opt_v; } } @@ -772,7 +772,7 @@ sub commit { waitpid($pid,0); die "Error running git-commit-tree: $?\n" if $?; - system("git-update-ref $remote/$branch $cid") == 0 + system('git-update-ref', "$remote/$branch", $cid) == 0 or die "Cannot write branch $branch for update: $!\n"; if ($tag) {