git.samba.org
/
jelmer
/
fast-export.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a72cdbe
)
Fix depot-path determination for git-p4 submit
author
Simon Hausmann
<shausman@trolltech.com>
Thu, 7 Jun 2007 11:10:20 +0000
(13:10 +0200)
committer
Simon Hausmann
<shausman@trolltech.com>
Thu, 7 Jun 2007 11:10:20 +0000
(13:10 +0200)
git-p4
patch
|
blob
|
history
diff --git
a/git-p4
b/git-p4
index 8be0afe8284f832e1058770a66c5b261e8ebd500..8b00e350ec277f1f8fe78430f7234f5e45cd8af5 100755
(executable)
--- a/
git-p4
+++ b/
git-p4
@@
-494,7
+494,7
@@
class P4Submit(Command):
settings = extractSettingsGitLog(extractLogMessageFromGitCommit("p4"))
if len(depotPath) == 0 and gitBranchExists("origin"):
settings = extractSettingsGitLog(extractLogMessageFromGitCommit("origin"))
- depotPath
s = settings['depot-paths'
]
+ depotPath
= settings['depot-paths'][0
]
if len(depotPath) == 0:
print "Internal error: cannot locate perforce depot path from existing branches"