aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-12-13 08:09:12 +0100
committerTorgny Nyblom <kde@nyblom.org>2010-12-13 08:09:12 +0100
commitf552e045dd68788b2502bb313bf3e268fc2d6d3c (patch)
tree4e86e1a5a4da7e3f1cff395be7ac1e8213ff3501 /src
parent8969033a246009f581b87d1f5aacaefffb8885ce (diff)
downloadsvn2git-f552e045dd68788b2502bb313bf3e268fc2d6d3c.tar
svn2git-f552e045dd68788b2502bb313bf3e268fc2d6d3c.tar.gz
svn2git-f552e045dd68788b2502bb313bf3e268fc2d6d3c.tar.bz2
svn2git-f552e045dd68788b2502bb313bf3e268fc2d6d3c.tar.xz
svn2git-f552e045dd68788b2502bb313bf3e268fc2d6d3c.zip
call startFastImport where it is used.
Diffstat (limited to 'src')
-rw-r--r--src/repository.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/repository.cpp b/src/repository.cpp
index f6b43e1..e9f7d2e 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -538,8 +538,6 @@ int FastImportRepository::markFrom(const QString &branchFrom, int branchRevNum,
int FastImportRepository::createBranch(const QString &branch, int revnum,
const QString &branchFrom, int branchRevNum)
{
- startFastImport();
-
QByteArray branchFromDesc = "from branch " + branchFrom.toUtf8();
int mark = markFrom(branchFrom, branchRevNum, branchFromDesc);
@@ -567,14 +565,14 @@ int FastImportRepository::createBranch(const QString &branch, int revnum,
int FastImportRepository::deleteBranch(const QString &branch, int revnum)
{
- startFastImport();
-
static QByteArray null_sha(40, '0');
return resetBranch(branch, revnum, 0, null_sha, "delete");
}
int FastImportRepository::resetBranch(const QString &branch, int revnum, int mark, const QByteArray &resetTo, const QByteArray &comment)
{
+ startFastImport();
+
QByteArray branchRef = branch.toUtf8();
if (!branchRef.startsWith("refs/"))
branchRef.prepend("refs/heads/");