aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTorgny Nyblom <kde@nyblom.org>2010-05-18 19:50:48 +0200
committerTorgny Nyblom <kde@nyblom.org>2010-05-18 19:50:48 +0200
commit125e8ac013f3fc7df64dde0a050c012235bdf185 (patch)
tree6e768d564dbc04f26a51f9ccf3089de0aba8d0b9 /src
parentdcb73d84fb8343eaccad8de9c8238944035c82ee (diff)
downloadsvn2git-125e8ac013f3fc7df64dde0a050c012235bdf185.tar
svn2git-125e8ac013f3fc7df64dde0a050c012235bdf185.tar.gz
svn2git-125e8ac013f3fc7df64dde0a050c012235bdf185.tar.bz2
svn2git-125e8ac013f3fc7df64dde0a050c012235bdf185.tar.xz
svn2git-125e8ac013f3fc7df64dde0a050c012235bdf185.zip
Make git fast-import save the used marks and hashes for later use.
Diffstat (limited to 'src')
-rw-r--r--src/repository.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/repository.cpp b/src/repository.cpp
index 8a2a2fb..f81bb26 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -270,6 +270,11 @@ void Repository::startFastImport()
processHasStarted = true;
// start the process
+ QString marksFile = name;
+ marksFile.replace('/', '_');
+ marksFile.prepend("marks-");
+ QStringList marksOptions;
+ marksOptions << "--export-marks=" + marksFile;
QString outputFile = name;
outputFile.replace('/', '_');
outputFile.prepend("log-");
@@ -277,7 +282,7 @@ void Repository::startFastImport()
fastImport.setProcessChannelMode(QProcess::MergedChannels);
if (!CommandLineParser::instance()->contains("dry-run")) {
- fastImport.start("git", QStringList() << "fast-import");
+ fastImport.start("git", QStringList() << "fast-import" << marksOptions);
} else {
fastImport.start("/bin/cat", QStringList());
}