From 125e8ac013f3fc7df64dde0a050c012235bdf185 Mon Sep 17 00:00:00 2001
From: Torgny Nyblom <kde@nyblom.org>
Date: Tue, 18 May 2010 19:50:48 +0200
Subject: Make git fast-import save the used marks and hashes for later use.

---
 src/repository.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'src')

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());
         }
-- 
cgit v1.2.1