From: Yann Dirson Date: Sun, 08 Jan 2006 00:38:15 GMT Subject: [PATCH 1/7] Add a minimal test for git-cherry Message-ID: <20060108003815.GI1113@nowhere.earth> This test checks that git-cherry finds the expected number of patches in two simple cases. Signed-off-by: Yann Dirson --- t/t3500-cherry.sh | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) create mode 100755 t/t3500-cherry.sh e9d999acb2653af449e3122872cbd4e8f8260c71 diff --git a/t/t3500-cherry.sh b/t/t3500-cherry.sh new file mode 100755 index 0000000..f2f9109 --- /dev/null +++ b/t/t3500-cherry.sh @@ -0,0 +1,47 @@ +#!/bin/sh +# +# Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland +# + +test_description='git-cherry should detect patches integrated upstream + +This test cherry-picks one local change of two into master branch, and +checks that git-cherry only returns the second patch in the local branch +' +. ./test-lib.sh + +export GIT_AUTHOR_EMAIL=bogus_email_address + +test_expect_success \ + 'prepare repository with topic branch, and check cherry finds the 2 patches from there' \ + 'echo First > A && + git-update-index --add A && + git-commit -m "Add A." && + + git-checkout -b my-topic-branch && + + echo Second > B && + git-update-index --add B && + git-commit -m "Add B." && + + echo AnotherSecond > C && + git-update-index --add C && + git-commit -m "Add C." && + + git-checkout -f master && + + echo Third >> A && + git-update-index A && + git-commit -m "Modify A." && + + expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* + .*" +' + +test_expect_success \ + 'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \ + 'git-cherry-pick my-topic-branch^0 && + echo $(git-cherry master my-topic-branch) && + expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* - .*" +' + +test_done -- 1.0.6-g8ecb -- Yann Dirson | Debian-related: | Support Debian GNU/Linux: | Freedom, Power, Stability, Gratis http://ydirson.free.fr/ | Check