From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 13 Mar 2008 06:47:31 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.5-rc0~20
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b75aaa546e0593440d85c77d380c9b53e126ea02?hp=-c

Merge branch 'maint'

* maint:
git-cvsimport: fix merging with remote parent branch
gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' form
---

b75aaa546e0593440d85c77d380c9b53e126ea02
diff --combined git-cvsimport.perl
index 47f116f37e,8093996e25..95c5eec51e
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@@ -15,7 -15,7 +15,7 @@@
  
  use strict;
  use warnings;
 -use Getopt::Std;
 +use Getopt::Long;
  use File::Spec;
  use File::Temp qw(tempfile tmpnam);
  use File::Path qw(mkpath);
@@@ -29,7 -29,7 +29,7 @@@ use IPC::Open2
  $SIG{'PIPE'}="IGNORE";
  $ENV{'TZ'}="UTC";
  
 -our ($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,$opt_M,$opt_A,$opt_S,$opt_L, $opt_a, $opt_r);
 +our ($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,@opt_M,$opt_A,$opt_S,$opt_L, $opt_a, $opt_r);
  my (%conv_author_name, %conv_author_email);
  
  sub usage(;$) {
@@@ -112,12 -112,7 +112,12 @@@ sub read_repo_config 
  
  my $opts = "haivmkuo:d:p:r:C:z:s:M:P:A:S:L:";
  read_repo_config($opts);
 -getopts($opts) or usage();
 +Getopt::Long::Configure( 'no_ignore_case', 'bundling' );
 +
 +# turn the Getopt::Std specification in a Getopt::Long one,
 +# with support for multiple -M options
 +GetOptions( map { s/:/=s/; /M/ ? "$_\@" : $_ } split( /(?!:)/, $opts ) )
 +    or usage();
  usage if $opt_h;
  
  if (@ARGV == 0) {
@@@ -169,10 -164,10 +169,10 @@@ if ($#ARGV == 0) 
  
  our @mergerx = ();
  if ($opt_m) {
 -	@mergerx = ( qr/\b(?:from|of|merge|merging|merged) (\w+)/i );
 +	@mergerx = ( qr/\b(?:from|of|merge|merging|merged) ([-\w]+)/i );
  }
 -if ($opt_M) {
 -	push (@mergerx, qr/$opt_M/);
 +if (@opt_M) {
 +	push (@mergerx, map { qr/$_/ } @opt_M);
  }
  
  # Remember UTC of our starting time
@@@ -735,7 -730,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;
  		}
  	}