Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-p4: Fix warnings about non-existant refs/remotes/p4/HEAD ref when running git-p4 sync the first time after a git clone.
author
Simon Hausmann
<simon@lst.de>
Fri, 24 Aug 2007 15:46:16 +0000
(17:46 +0200)
committer
Junio C Hamano
<gitster@pobox.com>
Sat, 25 Aug 2007 01:54:37 +0000
(18:54 -0700)
Don't create the p4/HEAD symbolic ref if p4/master doesn't exist yet.
Signed-off-by: Simon Hausmann <simon@lst.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
contrib/fast-import/git-p4
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
5ca4461
)
diff --git
a/contrib/fast-import/git-p4
b/contrib/fast-import/git-p4
index b571e304739d0d5f61d483f8ab6f2ab791370861..55778c577564dc2afde8cf36f3dbc1c994e4ded4 100755
(executable)
--- a/
contrib/fast-import/git-p4
+++ b/
contrib/fast-import/git-p4
@@
-1131,7
+1131,7
@@
class P4Sync(Command):
system("git update-ref %s refs/heads/p4" % self.branch)
system("git branch -D p4");
# create it /after/ importing, when master exists
- if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes:
+ if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes
and gitBranchExists(self.branch)
:
system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
# TODO: should always look at previous commits,