[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 1f36acea22310b0bf1944d2c8d531380ff1383d5..e3a8e584a562e8e50c5d7316acc653babafcd8ba 100755 (executable)
--- 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;