From: Vitor Antunes Date: Sat, 26 May 2012 09:56:06 GMT Subject: [PATCHv2 3/3] git-p4: Clean up branch test cases Message-ID: <1338026166-5462-4-git-send-email-vitor.hda@gmail.com> In-Reply-To: <1338026166-5462-1-git-send-email-vitor.hda@gmail.com> Correct submit description in one test and remove not required commands from another. Signed-off-by: Vitor Antunes --- 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 308b123..99fe16b 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) && -- 1.7.7.rc2.14.g5e044.dirty