diff options
| author | Vitor Antunes <vitor.hda@gmail.com> | 2012-05-26 10:56:06 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-29 10:46:00 -0700 |
| commit | 5d5c556ac41268935e99aacb09c90a31f18d876b (patch) | |
| tree | 0746cd2058bce3e8587ebdbd6a57a8151cd080db | |
| parent | ad71f6617e7605315a225a1fce5e6e6a12042d04 (diff) | |
| download | git-5d5c556ac41268935e99aacb09c90a31f18d876b.tar.gz | |
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>
| -rwxr-xr-x | t/t9801-git-p4-branch.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 308b123cfd..99fe16b72d 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -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 && @@ -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) && |