summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Langhoff <martin@ng.eduforge.org>2005-08-16 21:27:09 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-08-17 21:53:39 (GMT)
commit049f28c3929fa722634ecb7bb39d78457018815a (patch)
treef98d759d87116dc9e381ac84b5978f74bd502ff9
parentdb4b65821e65138177de9afbce70f141cc831224 (diff)
downloadgit-049f28c3929fa722634ecb7bb39d78457018815a.zip
git-049f28c3929fa722634ecb7bb39d78457018815a.tar.gz
git-049f28c3929fa722634ecb7bb39d78457018815a.tar.bz2
[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>
-rwxr-xr-xgit-cvsimport-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script
index 1f36ace..e3a8e58 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;