git-cvsimport: fix merging with remote parent branch
commit-tree fails when specifying a remote name (via -r option) and one of the parent branch has a name. Prefixing with "$remote/" fix it. Signed-off-by: Marc-Andre Lureau <marcandre.lureau@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Marc-Andre Lureau committed
Mar 12, 2008 at 21:54 UTC
c36c5b845e1958bad1b69ee42e3da926de4f948b
1 file changed
+1
-1
git-cvsimport.perl
+1
-1
@@ -730,7 +730,7 @@ sub commit {
730
next unless $logmsg =~ $rx && $1;
731
my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
732
if (my $sha1 = get_headref("$remote/$mparent")) {
733
- push @commit_args, '-p', $mparent;
733
+ push @commit_args, '-p', "$remote/$mparent";
734
print "Merge parent branch: $mparent\n" if $opt_v;
735
}
736
}