mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  git-cvsimport: fix merging with remote parent branch
  gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
This commit is contained in:
Junio C Hamano 2008-03-12 23:47:31 -07:00
commit b75aaa546e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
git-cvsimport.perl
View File

@ -735,7 +735,7 @@ sub commit {
next unless $logmsg =~ $rx && $1; next unless $logmsg =~ $rx && $1;
my $mparent = $1 eq 'HEAD' ? $opt_o : $1; my $mparent = $1 eq 'HEAD' ? $opt_o : $1;
if (my $sha1 = get_headref("$remote/$mparent")) { 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; print "Merge parent branch: $mparent\n" if $opt_v;
} }
} }