mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
[PATCH] git-cvsimport - remove hardcoded reference to origin
... in the newly introduced merge detection code. Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
db4b65821e
commit
049f28c392
|
@ -579,7 +579,7 @@ my $commit = sub {
|
|||
foreach my $rx (@mergerx) {
|
||||
if ($logmsg =~ $rx) {
|
||||
my $mparent = $1;
|
||||
if ($mparent eq 'HEAD') { $mparent = 'origin'};
|
||||
if ($mparent eq 'HEAD') { $mparent = $opt_o };
|
||||
if ( -e "$git_dir/refs/heads/$mparent") {
|
||||
$mparent = get_headref($mparent, $git_dir);
|
||||
push @par, '-p', $mparent;
|
||||
|
|
Loading…
Reference in a new issue