diff options
| author |  Simon Hausmann <shausman@trolltech.com> | 2007-06-22 00:01:57 +0200 |
|---|---|---|
| committer |  Simon Hausmann <simon@lst.de> | 2007-06-22 00:00:34 +0200 |
| commit | 9ceab36375dfd4088b265033e1de9225b3527cab (patch) | |
| tree | 9a0e9944ed8551bdb6f4629091d5489d7bf80ace /contrib/fast-import | |
| parent | Added git-p4 branches command that shows the mapping of perforce depot paths ... (diff) | |
| download | tgif-9ceab36375dfd4088b265033e1de9225b3527cab.tar.xz | |
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>
Diffstat (limited to 'contrib/fast-import')
| -rwxr-xr-x | contrib/fast-import/git-p4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fast-import/git-p4 b/contrib/fast-import/git-p4 index 16de15c4ea..54a05eb99c 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"): |