undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git p4: create p4/HEAD on initial clone

Browse Source 
There is code to create a symbolic reference from p4/HEAD to
p4/master.  This allows saying "git show p4" as a shortcut
to "git show p4/master", for example.

But this reference was only created on the second "git p4 sync"
(or first sync after a clone).  Make it work on the initial
clone or sync.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2013-01-14 19:46:59 -05:00 committed by Junio C Hamano
parent 3b650fc986
commit 55d124376f
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
git-p4.py
View File

@ -2772,10 +2772,7 @@ class P4Sync(Command, P4UserMap):
self.branch = self.refPrefix + "master" self.branch = self.refPrefix + "master"
if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: if gitBranchExists("refs/heads/p4") and self.importIntoRemotes:
system("git update-ref %s refs/heads/p4" % self.branch) system("git update-ref %s refs/heads/p4" % self.branch)
system("git branch -D p4"); system("git branch -D p4")
# create it /after/ importing, when master exists
if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch):
system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch))
# accept either the command-line option, or the configuration variable # accept either the command-line option, or the configuration variable
if self.useClientSpec: if self.useClientSpec:
@ -3007,6 +3004,13 @@ class P4Sync(Command, P4UserMap):
read_pipe("git update-ref -d %s" % branch) read_pipe("git update-ref -d %s" % branch)
os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation)) os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation))
# Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow
# a convenient shortcut refname "p4".
if self.importIntoRemotes:
head_ref = self.refPrefix + "HEAD"
if not gitBranchExists(head_ref) and gitBranchExists(self.branch):
system(["git", "symbolic-ref", head_ref, self.branch])
return True return True
class P4Rebase(Command): class P4Rebase(Command):

23
t/t9806-git-p4-options.sh
View File

@ -83,6 +83,29 @@ test_expect_failure 'sync --branch updates specified branch' '
) )
' '
# allows using the refname "p4" as a short name for p4/master
test_expect_success 'clone creates HEAD symbolic reference' '
git p4 clone --dest="$git" //depot &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git rev-parse --verify refs/remotes/p4/master >master &&
git rev-parse --verify p4 >p4 &&
test_cmp master p4
)
'
test_expect_success 'clone --branch creates HEAD symbolic reference' '
git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot &&
test_when_finished cleanup_git &&
(
cd "$git" &&
git rev-parse --verify refs/remotes/p4/sb >sb &&
git rev-parse --verify p4 >p4 &&
test_cmp sb p4
)
'
test_expect_success 'clone --changesfile' ' test_expect_success 'clone --changesfile' '
test_when_finished "rm cf" && test_when_finished "rm cf" &&
printf "1\n3\n" >cf && printf "1\n3\n" >cf &&