From 0433167eb506463529691b83d3a8094022cc15aa Mon Sep 17 00:00:00 2001 From: =?utf8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Wed, 16 Apr 2008 08:04:59 +0200 Subject: [PATCH] Don't use a global $mark. --- git2svn | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/git2svn b/git2svn index c2cfa3d..ab46497 100755 --- a/git2svn +++ b/git2svn @@ -219,7 +219,6 @@ print OUT "SVN-fs-dump-format-version: 3\n"; my $next = next_line(); COMMAND: while (!eof(IN)) { - my $mark = undef; if ($next eq "") { $next = next_line($IN); next COMMAND; @@ -229,11 +228,11 @@ COMMAND: while (!eof(IN)) { $next = next_line($IN); if ($next =~ m/mark +(.*)/) { - $mark = $1; + $commit{Mark} = $1; $next = next_line($IN); } if ($next =~ m/author +(.*)/) { - $commit{author} = $1; + $commit{Author} = $1; $next = next_line($IN); } unless ($next =~ m/committer +(.+) +<([^>]+)> +(\d+) +[+-](\d+)$/) { @@ -250,9 +249,11 @@ COMMAND: while (!eof(IN)) { $next = next_line($IN); if ($next =~ m/from (.*)/) { + $commit{From} = $1; $next = next_line($IN); } if ($next =~ m/merge (.*)/) { + $commit{Merge} = $1; $next = next_line($IN); } @@ -368,6 +369,7 @@ COMMAND: while (!eof(IN)) { } elsif ($next =~ /^tag .*/) { } elsif ($next =~ /^reset .*/) { } elsif ($next =~ /^blob/) { + my $mark = undef; $next = next_line($IN); if ($next =~ m/mark (.*)/) { $mark = $1; -- 2.11.4.GIT