diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-13 09:47:31 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-13 09:47:31 +0300 |
| commit | b75aaa546e0593440d85c77d380c9b53e126ea02 (patch) | |
| tree | 30e9c710db9fd896f34d211bd5acaa93f4924cd0 /git-cvsimport.perl | |
| parent | 25ee9731c137d0a24b0f4879eb0b0cce9b77d5b0 (diff) | |
| parent | c36c5b845e1958bad1b69ee42e3da926de4f948b (diff) | |
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-x | git-cvsimport.perl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 47f116f37e..95c5eec51e 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; } } |