From f2fb603396b416e6516970f4ca5286a4f23c36ca Mon Sep 17 00:00:00 2001
From: Torgny Nyblom <kde@nyblom.org>
Date: Wed, 8 Sep 2010 21:35:19 +0200
Subject: Inter branch merging causes git log to break with fatal internal
 errors

---
 src/repository.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/repository.cpp b/src/repository.cpp
index d071ce6..dc184ef 100644
--- a/src/repository.cpp
+++ b/src/repository.cpp
@@ -681,10 +681,10 @@ void FastImportRepository::Transaction::setLog(const QByteArray &l)
 
 void FastImportRepository::Transaction::noteCopyFromBranch(const QString &branchFrom, int branchRevNum)
 {
-    //if(branch == branchFrom) {
-    //    qWarning() << "Cannot merge inside a branch";
-    //    return;
-    //}
+    if(branch == branchFrom) {
+        qWarning() << "Cannot merge inside a branch";
+        return;
+    }
     static QByteArray dummy;
     int mark = repository->markFrom(branchFrom, branchRevNum, dummy);
     Q_ASSERT(dummy.isEmpty());
-- 
cgit v1.2.1