Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
authorSimon Hausmann <shausman@trolltech.com>
Thu, 21 Jun 2007 22:01:57 +0000 (00:01 +0200)
committerSimon Hausmann <simon@lst.de>
Thu, 21 Jun 2007 22:00:34 +0000 (00:00 +0200)
This isn't used right now in git-p4 but I use it in an external script that loads git-p4 as module.

Signed-off-by: Simon Hausmann <shausman@trolltech.com>
contrib/fast-import/git-p4

index 16de15c4ea1f36a90e37c049eef0ee978b7a7824..54a05eb99c3eb747fcf26cfa3fc51a12f9055bd3 100755 (executable)
@@ -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"):