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 76c4b9d3230dfff589ea2fb9f7da30a0e339cf17..f37fdcf96e324c1441b2b791a90860c1f4506f41 100755 (executable)
--- 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):