git-p4: Clean up branch test cases
Correct submit description in one test and remove not required commands from another. Signed-off-by: Vitor Antunes <vitor.hda@gmail.com> Acked-by: Pete Wyckoff <pw@padd.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Vitor Antunes committed
May 26, 2012 at 10:56 UTC
5d5c556ac41268935e99aacb09c90a31f18d876b
1 file changed
+1
-3
t/t9801-git-p4-branch.sh
+1
-3
@@ -218,7 +218,7 @@ test_expect_success 'git p4 clone simple branches' '
218
cd branch1 &&
219
p4 edit file2 &&
220
echo file2_ >>file2 &&
221
- p4 submit -d "update file2 in branch3" &&
221
+ p4 submit -d "update file2 in branch1" &&
222
cd "$git" &&
223
git reset --hard p4/depot/branch1 &&
224
git p4 rebase &&
@@ -249,8 +249,6 @@ test_expect_success 'git p4 clone simple branches' '
249
# `- file2
250
# `- file3
251
test_expect_success 'git p4 add complex branches' '
252
- test_when_finished cleanup_git &&
253
- test_create_repo "$git" &&
252
(
253
cd "$cli" &&
254
changelist=$(p4 changes -m1 //depot/... | cut -d" " -f2) &&