summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorMarc-Andre Lureau <marcandre.lureau@gmail.com>2008-03-12 19:54:21 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-13 04:03:39 (GMT)
commitc36c5b845e1958bad1b69ee42e3da926de4f948b (patch)
tree3f5d0191d3a303b4d8ce20fef828abb2fef4b897 /git-cvsimport.perl
parent7863c612f402268b5978683f44adad3a7a867613 (diff)
downloadgit-c36c5b845e1958bad1b69ee42e3da926de4f948b.zip
git-c36c5b845e1958bad1b69ee42e3da926de4f948b.tar.gz
git-c36c5b845e1958bad1b69ee42e3da926de4f948b.tar.bz2
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>
Diffstat (limited to 'git-cvsimport.perl')
-rwxr-xr-xgit-cvsimport.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 9516242..8093996 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;
}
}