Bugfix: don't forget the newline after the commit message

[svn-all-fast-export.git] / src / repository.cpp

diff --git a/src/repository.cpp b/src/repository.cpp
index 1cb7c410a0370f38f4b76b51f94829fc4c1230b0..0e9226fbf81efd5c336b22ac47811a59f92a5590 100644 (file)
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -201,12 +201,17 @@ void Repository::Transaction::commit()
         s << "committer " << author << ' ' << datetime << " -0000" << endl;
 
         Branch &br = repository->branches[branch];
-        Q_ASSERT(br.created);
+        if (!br.created) {
+            qWarning() << "Branch" << branch << "doesn't exist at revision"
+                       << revnum << "-- did you resume from the wrong revision?";
+            br.created = revnum;
+        }
 
         s << "data " << message.length() << endl;
     }
 
     repository->fastImport.write(message);
+    repository->fastImport.putChar('\n');
 
     // write the file deletions
     if (deletedFiles.contains(""))