From: Simon Hausmann <shausman@trolltech.com>
Date: Thu, 21 Jun 2007 22:01:57 +0000 (+0200)
Subject: Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.
X-Git-Tag: v1.5.3-rc0~65^2^2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9ceab36375dfd4088b265033e1de9225b3527cab;p=git.git

Make it possible to specify the HEAD for the internal findUpstreamBranchPoint function.

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>
---

diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4
index 16de15c4e..54a05eb99 100755
--- 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"):