[PATCH] git-cvsimport - remove hardcoded reference to origin
Signed-off-by: Martin Langhoff <martin.langhoff@gmail.com>
---
git-cvsimport-script | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
61d32d57375d751f565baf61a144ebd6e0d6a61d
Show changes to git-cvsimport-script +1 −1
diff --git a/git-cvsimport-script b/git-cvsimport-script
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -578,7 +578,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;