git-cvsimport: fix merging with remote parent branch

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242338d95687b4354a6d21692cbd10547899..8093996e257e510da9060a3d00661170c59437b6 100755 (executable)
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -730,7 +730,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;
                }
        }