diff options
| author |  Martin Langhoff <martin@ng.eduforge.org> | 2005-08-17 09:27:09 +1200 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2005-08-17 14:53:39 -0700 |
| commit | 049f28c3929fa722634ecb7bb39d78457018815a (patch) | |
| tree | f98d759d87116dc9e381ac84b5978f74bd502ff9 /git-cvsimport-script | |
| parent | [PATCH] Add merge detection to git-cvsimport (diff) | |
| download | tgif-049f28c3929fa722634ecb7bb39d78457018815a.tar.xz | |
[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>
Diffstat (limited to 'git-cvsimport-script')
| -rwxr-xr-x | git-cvsimport-script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script index 1f36acea22..e3a8e584a5 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; |