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

git-p4: support clone --bare

Browse Source 
Just like git clone --bare, build a .git directory but no
checked out files.

Signed-off-by: Pete Wyckoff <pw@padd.com>
Acked-By: Tor Arvid Lund <torarvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Pete Wyckoff 2011-02-19 08:18:01 -05:00 committed by Junio C Hamano
parent 084f6306d4
commit 3820007694
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
contrib/fast-import/git-p4
View File

@ -1776,10 +1776,13 @@ class P4Clone(P4Sync):
help="where to leave result of the clone"), help="where to leave result of the clone"),
optparse.make_option("-/", dest="cloneExclude", optparse.make_option("-/", dest="cloneExclude",
action="append", type="string", action="append", type="string",
help="exclude depot path") help="exclude depot path"),
optparse.make_option("--bare", dest="cloneBare",
action="store_true", default=False),
] ]
self.cloneDestination = None self.cloneDestination = None
self.needsGit = False self.needsGit = False
self.cloneBare = False
# This is required for the "append" cloneExclude action # This is required for the "append" cloneExclude action
def ensure_value(self, attr, value): def ensure_value(self, attr, value):
@ -1819,11 +1822,16 @@ class P4Clone(P4Sync):
self.cloneDestination = self.defaultDestination(args) self.cloneDestination = self.defaultDestination(args)
print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination) print "Importing from %s into %s" % (', '.join(depotPaths), self.cloneDestination)
if not os.path.exists(self.cloneDestination): if not os.path.exists(self.cloneDestination):
os.makedirs(self.cloneDestination) os.makedirs(self.cloneDestination)
chdir(self.cloneDestination) chdir(self.cloneDestination)
system("git init")
self.gitdir = os.getcwd() + "/.git" init_cmd = [ "git", "init" ]
if self.cloneBare:
init_cmd.append("--bare")
subprocess.check_call(init_cmd)
if not P4Sync.run(self, depotPaths): if not P4Sync.run(self, depotPaths):
return False return False
if self.branch != "master": if self.branch != "master":
@ -1833,7 +1841,8 @@ class P4Clone(P4Sync):
masterbranch = "refs/heads/p4/master" masterbranch = "refs/heads/p4/master"
if gitBranchExists(masterbranch): if gitBranchExists(masterbranch):
system("git branch master %s" % masterbranch) system("git branch master %s" % masterbranch)
system("git checkout -f") if not self.cloneBare:
system("git checkout -f")
else: else:
print "Could not detect main branch. No checkout/master branch created." print "Could not detect main branch. No checkout/master branch created."

10
t/t9800-git-p4.sh
View File

@ -80,6 +80,16 @@ test_expect_success 'wildcard files git-p4 clone' '
rm -rf "$git" && mkdir "$git" rm -rf "$git" && mkdir "$git"
' '
test_expect_success 'clone bare' '
"$GITP4" clone --dest="$git" --bare //depot &&
cd "$git" &&
test ! -d .git &&
bare=`git config --get core.bare` &&
test "$bare" = true &&
cd "$TRASH_DIRECTORY" &&
rm -rf "$git" && mkdir "$git"
'
test_expect_success 'shutdown' ' test_expect_success 'shutdown' '
pid=`pgrep -f p4d` && pid=`pgrep -f p4d` &&
test -n "$pid" && test -n "$pid" &&