Skip to content

Commit

Permalink
git-p4: Clean up branch test cases
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Vitor Antunes authored and Junio C Hamano committed May 29, 2012
1 parent ad71f66 commit 5d5c556
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions t/t9801-git-p4-branch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ test_expect_success 'git p4 clone simple branches' '
cd branch1 &&
p4 edit file2 &&
echo file2_ >>file2 &&
p4 submit -d "update file2 in branch3" &&
p4 submit -d "update file2 in branch1" &&
cd "$git" &&
git reset --hard p4/depot/branch1 &&
git p4 rebase &&
Expand Down Expand Up @@ -249,8 +249,6 @@ test_expect_success 'git p4 clone simple branches' '
# `- file2
# `- file3
test_expect_success 'git p4 add complex branches' '
test_when_finished cleanup_git &&
test_create_repo "$git" &&
(
cd "$cli" &&
changelist=$(p4 changes -m1 //depot/... | cut -d" " -f2) &&
Expand Down

0 comments on commit 5d5c556

Please sign in to comment.