From: Martin Langhoff <martin@ng.eduforge.org>
Date: Tue, 16 Aug 2005 21:27:09 +0000 (+1200)
Subject: [PATCH] git-cvsimport - remove hardcoded reference to origin
X-Git-Tag: v0.99.5~15^2~5
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=049f28c3929fa722634ecb7bb39d78457018815a;p=git.git

[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>
---

diff --git a/git-cvsimport-script b/git-cvsimport-script
index 1f36acea2..e3a8e584a 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -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;