Merge branch 'lt/follow'

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 16de15c4ea1f36a90e37c049eef0ee978b7a7824..54a05eb99c3eb747fcf26cfa3fc51a12f9055bd3 100755 (executable)
--- a/contrib/fast-import/git-p4
+++ b/contrib/fast-import/git-p4
@@ -168,12 +168,12 @@ def gitBranchExists(branch):
 def gitConfig(key):
     return read_pipe("git config %s" % key, ignore_error=True).strip()
 
-def findUpstreamBranchPoint():
+def findUpstreamBranchPoint(head = "HEAD"):
     settings = None
     branchPoint = ""
     parent = 0
     while parent < 65535:
-        commit = "HEAD~%s" % parent
+        commit = head + "~%s" % parent
         log = extractLogMessageFromGitCommit(commit)
         settings = extractSettingsGitLog(log)
         if not settings.has_key("depot-paths"):