aboutsummaryrefslogtreecommitdiffstats
path: root/src/ruleparser.cpp
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-04-12 20:37:06 +0200
committerTorgny Nyblom <kde@nyblom.org>2010-04-12 20:37:06 +0200
commit70499909cc1dfed644aefbc9fa47eb7e8359dad1 (patch)
tree392c4dd9113041b32b74391087a879fbd58683d6 /src/ruleparser.cpp
parent260906c6675b71bcd890e761f23cb7c4a27ac7a8 (diff)
downloadsvn2git-70499909cc1dfed644aefbc9fa47eb7e8359dad1.tar
svn2git-70499909cc1dfed644aefbc9fa47eb7e8359dad1.tar.gz
svn2git-70499909cc1dfed644aefbc9fa47eb7e8359dad1.tar.bz2
svn2git-70499909cc1dfed644aefbc9fa47eb7e8359dad1.tar.xz
svn2git-70499909cc1dfed644aefbc9fa47eb7e8359dad1.zip
Fix logical error (deleted paths was ignored)
Improve the ruleparser so that prefix never starts or ends with a '/'
Diffstat (limited to 'src/ruleparser.cpp')
-rw-r--r--src/ruleparser.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ruleparser.cpp b/src/ruleparser.cpp
index 7ae9570..6e78efe 100644
--- a/src/ruleparser.cpp
+++ b/src/ruleparser.cpp
@@ -102,7 +102,9 @@ void Rules::load()
} else if (matchPrefixLine.exactMatch(line)) {
match.prefix = matchPrefixLine.cap(1);
if( match.prefix.startsWith('/'))
- qFatal("Prefix starts with \"/\" on line %d, this can cause git-fast-import to crach.", lineNumber );
+ match.prefix = match.prefix.mid(1);
+ if( match.prefix.endsWith('/'))
+ match.prefix.chop(1);
continue;
} else if (matchActionLine.exactMatch(line)) {
QString action = matchActionLine.cap(1);