mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-06-03 09:56:15 +02:00
Code

Merge branch 'pw/p4' 

* pw/p4:
  git-p4: test clone @all
  git-p4: fix clone @all regression
This commit is contained in:
Junio C Hamano 2011-03-13 00:10:06 -08:00
parent adfe4e1ff2 f0c9fe0504
commit ae4479d494
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1763,7 +1763,7 @@ class P4Sync(Command):
changes.sort()
else:
if not self.p4BranchesInGit:
if not isinstance(self, P4Clone) and not self.p4BranchesInGit:
die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.");
if self.verbose:
print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths),

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

@ -37,11 +37,27 @@ test_expect_success 'add p4 files' '
echo file1 >file1 &&
p4 add file1 &&
p4 submit -d "file1" &&
echo file2 >file2 &&
p4 add file2 &&
p4 submit -d "file2" &&
cd "$TRASH_DIRECTORY"
'
test_expect_success 'basic git-p4 clone' '
"$GITP4" clone --dest="$git" //depot &&
cd "$git" &&
git log --oneline >lines &&
test_line_count = 1 lines &&
cd .. &&
rm -rf "$git" && mkdir "$git"
'
test_expect_success 'git-p4 clone @all' '
"$GITP4" clone --dest="$git" //depot@all &&
cd "$git" &&
git log --oneline >lines &&
test_line_count = 2 lines &&
cd .. &&
rm -rf "$git" && mkdir "$git"
'