diff options
| author | Torgny Nyblom <kde@nyblom.org> | 2010-08-18 12:54:03 +0200 |
|---|---|---|
| committer | Torgny Nyblom <kde@nyblom.org> | 2010-08-18 12:54:03 +0200 |
| commit | a9851327eaa451820fbf90ed9d3f62441314cbb9 (patch) | |
| tree | cb4dafdbf6821a226ba648345420aefb3bab88e3 | |
| parent | 7b9ef74b8816a3993b6ddfafcc028cbd195b0f94 (diff) | |
| parent | 9bdc2a66b057099a7bca628f26de87d2b4b55400 (diff) | |
| download | svn2git-a9851327eaa451820fbf90ed9d3f62441314cbb9.tar svn2git-a9851327eaa451820fbf90ed9d3f62441314cbb9.tar.gz svn2git-a9851327eaa451820fbf90ed9d3f62441314cbb9.tar.bz2 svn2git-a9851327eaa451820fbf90ed9d3f62441314cbb9.tar.xz svn2git-a9851327eaa451820fbf90ed9d3f62441314cbb9.zip | |
Merge commit 'refs/merge-requests/7' of git://gitorious.org/svn2git/svn2git into integration
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index a00c6dc..0edf8f5 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -41,7 +41,11 @@ QHash<QByteArray, QByteArray> loadIdentityMapFile(const QString &fileName) } while (!file.atEnd()) { - QByteArray line = file.readLine().trimmed(); + QByteArray line = file.readLine(); + int comment_pos = line.indexOf('#'); + if (comment_pos != -1) + line.truncate(comment_pos); + line = line.trimmed(); int space = line.indexOf(' '); if (space == -1) continue; // invalid line |