From: Marc-Andre Lureau <marcandre.lureau@gmail.com>
Date: Wed, 12 Mar 2008 19:54:21 +0000 (+0200)
Subject: git-cvsimport: fix merging with remote parent branch
X-Git-Tag: v1.5.5-rc0~2^2~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c36c5b845e1958bad1b69ee42e3da926de4f948b;p=git.git

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>
---

diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 951624233..8093996e2 100755
--- 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;
 		}
 	}