{"thread":{"id":"28246","subject":"[PATCH] git-p4: simple branch tests edits","startedAt":"2011-08-29T09:32:23Z","lastAt":"2011-08-29T09:32:23Z","messageCount":1,"participants":["Vitor Antunes"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"174453","messageId":"1314610343-13488-1-git-send-email-vitor.hda@gmail.com","threadId":"28246","inReplyTo":null,"subject":"[PATCH] git-p4: simple branch tests edits","fromName":"Vitor Antunes","fromEmail":"vitor.hda@gmail.com","sentAt":"2011-08-29T09:32:23Z","receivedAt":"2011-08-29T09:32:23Z","isPatch":true,"sender":{"key":"vitor.hda@gmail.com","avatar":"https://avatars.githubusercontent.com/u/606876?v=4"},"body":"From: Pete Wyckoff <pw@padd.com>\n\nMore review comments.\n\nSigned-off-by: Pete Wyckoff <pw@padd.com>\nSigned-off-by: Vitor Antunes <vitor.hda@gmail.com>\n---\n t/t9800-git-p4.sh |   19 ++++++++-----------\n 1 files changed, 8 insertions(+), 11 deletions(-)\n\ndiff --git a/t/t9800-git-p4.sh b/t/t9800-git-p4.sh\nindex 39e7f78..01ba041 100755\n--- a/t/t9800-git-p4.sh\n+++ b/t/t9800-git-p4.sh\n@@ -413,7 +413,7 @@ test_expect_success 'add simple p4 branches' '\n \tcd branch1 &&\n \techo file1 >file1 &&\n \techo file2 >file2 &&\n-\tp4 add file* &&\n+\tp4 add file1 file2 &&\n \tp4 submit -d \"branch1\" &&\n \tp4 integrate //depot/branch1/... //depot/branch2/... &&\n \tp4 submit -d \"branch2\" &&\n@@ -433,13 +433,12 @@ test_expect_success 'add simple p4 branches' '\n # Finally, make an update to branch1 on P4 side to check if it is imported\n # correctly by git-p4.\n test_expect_success 'git-p4 clone simple branches' '\n-\tgit init \"$git\" &&\n+\ttest_when_finished cleanup_git &&\n+\ttest_create_repo \"$git\" &&\n \tcd \"$git\" &&\n \tgit config git-p4.branchList branch1:branch2 &&\n \tgit config --add git-p4.branchList branch1:branch3 &&\n-\tcd \"$TRASH_DIRECTORY\" &&\n-\t\"$GITP4\" clone --dest=\"$git\" --detect-branches //depot@all &&\n-\tcd \"$git\" &&\n+\t\"$GITP4\" clone --dest=. --detect-branches //depot@all &&\n \tgit log --all --graph --decorate --stat &&\n \tgit reset --hard p4/depot/branch1 &&\n \ttest -f file1 &&\n@@ -449,7 +448,7 @@ test_expect_success 'git-p4 clone simple branches' '\n \tgit reset --hard p4/depot/branch2 &&\n \ttest -f file1 &&\n \ttest -f file2 &&\n-\ttest \\! -z file3 &&\n+\ttest ! -f file3 &&\n \t! grep -q update file2 &&\n \tgit reset --hard p4/depot/branch3 &&\n \ttest -f file1 &&\n@@ -459,14 +458,12 @@ test_expect_success 'git-p4 clone simple branches' '\n \tcd \"$cli\" &&\n \tcd branch1 &&\n \tp4 edit file2 &&\n-\techo file2_ >> file2 &&\n-\tp4 submit -d \"update file2 in branch3\" &&\n+\techo file2_ >>file2 &&\n+\tp4 submit -d \"update file2 in branch1\" &&\n \tcd \"$git\" &&\n \tgit reset --hard p4/depot/branch1 &&\n \t\"$GITP4\" rebase &&\n-\tgrep -q file2_ file2 &&\n-\tcd \"$TRASH_DIRECTORY\" &&\n-\trm -rf \"$git\" && mkdir \"$git\"\n+\tgrep -q file2_ file2\n '\n \n test_expect_success 'shutdown' '\n-- \n1.7.5.4\n"}]}