aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-09-15 06:52:02 +0200
committerTorgny Nyblom <kde@nyblom.org>2010-09-15 06:52:02 +0200
commit05968a48886e95d11439a29c0510d31e27f44a6c (patch)
treed84b37049937a704367051908596719d12411416
parente1bebdeb498dcfd772303a8e193f2ca989f67d92 (diff)
downloadsvn2git-05968a48886e95d11439a29c0510d31e27f44a6c.tar
svn2git-05968a48886e95d11439a29c0510d31e27f44a6c.tar.gz
svn2git-05968a48886e95d11439a29c0510d31e27f44a6c.tar.bz2
svn2git-05968a48886e95d11439a29c0510d31e27f44a6c.tar.xz
svn2git-05968a48886e95d11439a29c0510d31e27f44a6c.zip
Fix assert when br.marks is empty
-rw-r--r--src/repository.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/repository.cpp b/src/repository.cpp
index cb48b71..5c8d9c1 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -572,7 +572,7 @@ int FastImportRepository::resetBranch(const QString &branch, int revnum, int mar
branchRef.prepend("refs/heads/");
Branch &br = branches[branch];
- if (br.created && br.created != revnum && br.marks.last()) {
+ if (br.created && br.created != revnum && !br.marks.isEmpty()) {
QByteArray backupBranch = "refs/backups/r" + QByteArray::number(revnum) + branchRef.mid(4);
qWarning() << "backing up branch" << branch << "to" << backupBranch;