mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
54 lines
1.4 KiB
Bash
54 lines
1.4 KiB
Bash
![]() |
#!/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." &&
|
||
|
|
||
|
sleep 2 &&
|
||
|
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 \
|
||
|
'check that cherry with limit returns only the top patch'\
|
||
|
'expr "$(echo $(git-cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
|
||
|
'
|
||
|
|
||
|
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
|