From: Simon Hausmann <hausmann@kde.org>
Date: Sat, 17 Feb 2007 15:18:22 +0000 (+1000)
Subject: Fix single-branch imports by skipping the branch/merge detection correctly.
X-Git-Tag: v1.5.3-rc0~65^2^2~202
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=90dc3dfdc8ab903f5eb12f7081dd43b67c8c112a;p=git.git

Fix single-branch imports by skipping the branch/merge detection correctly.

Signed-off-by: Simon Hausmann <hausmann@kde.org>
---

diff --git a/contrib/fast-import/p4-fast-export.py b/contrib/fast-import/p4-fast-export.py
index 76c4b9d32..f37fdcf96 100755
--- a/contrib/fast-import/p4-fast-export.py
+++ b/contrib/fast-import/p4-fast-export.py
@@ -210,7 +210,7 @@ def commit(details, files, branch, branchPrefix):
     merges = Set()
 
     for file in files:
-        if lastChange == 0:
+        if lastChange == 0 or not detectBranches:
             continue
         path = file["path"]
         if not path.startswith(branchPrefix):