summaryrefslogtreecommitdiff
path: root/git-cvsimport.perl
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-03-13 06:47:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-13 06:47:31 (GMT)
commitb75aaa546e0593440d85c77d380c9b53e126ea02 (patch)
tree30e9c710db9fd896f34d211bd5acaa93f4924cd0 /git-cvsimport.perl
parent25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 (diff)
parentc36c5b845e1958bad1b69ee42e3da926de4f948b (diff)
downloadgit-b75aaa546e0593440d85c77d380c9b53e126ea02.zip
git-b75aaa546e0593440d85c77d380c9b53e126ea02.tar.gz
git-b75aaa546e0593440d85c77d380c9b53e126ea02.tar.bz2
Merge branch 'maint'
* maint: git-cvsimport: fix merging with remote parent branch gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
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 47f116f..95c5eec 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;
}
}