summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Sven Verdoolaege <skimo@liacs.nl>2005-07-12 23:35:32 +0200
committerLibravatar Linus Torvalds <torvalds@g5.osdl.org>2005-07-12 15:37:25 -0700
commitd6d8dac032e0e0c55b3edffbefd0abb00ca960fc (patch)
treedb66d0759f97016bd123e2351aa0e77585e3177b
parent[PATCH] git: fix trivial warning from show_rename_copy() (diff)
downloadtgif-d6d8dac032e0e0c55b3edffbefd0abb00ca960fc.tar.xz
[PATCH] git-cvsimport-script: parse multidigit revisions.
Previously, git-cvsimport-script would fail on revisions with more than one digit. Signed-off-by: Sven Verdoolaege <skimo@kotnet.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rwxr-xr-xgit-cvsimport-script2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-cvsimport-script b/git-cvsimport-script
index 0ed12ff34b..8f57396c2d 100755
--- a/git-cvsimport-script
+++ b/git-cvsimport-script
@@ -675,7 +675,7 @@ while(<CVS>) {
$state = 9;
} elsif($state == 8) {
$logmsg .= "$_\n";
- } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d(?:\.\d+)+)->(\d(?:\.\d+)+)\s*$/) {
+ } elsif($state == 9 and /^\s+(\S+):(INITIAL|\d+(?:\.\d+)+)->(\d+(?:\.\d+)+)\s*$/) {
# VERSION:1.96->1.96.2.1
my $init = ($2 eq "INITIAL");
my $fn = $1;