mirror of
https://github.com/git/git.git
synced 2024-11-16 06:03:44 +01:00
016e5ff243
In many places in test suite we have "sleep"s that do not have to be there. - I do not simply see the point of the one in t3500. It may be making sure that the timestamp order of commits generated during the test is stable, in which case test_tick is the right ingredient to use without wasting tester's time. - The one in t4011 is to make sure that the plumbing diff-index notices the stat-dirtyness of a removed then identically recreated symlink. Keeping the old symlink around to make sure that a newly created symlink gets different ino would be sufficient for that purpose. - The one in t7600 is to make sure that "git merge" does not get confused by stat-dirty "file" in the working tree. Again, keeping the old file around and creating an identical copy to ensure a different ino would be sufficient for that purpose. The "racy git" tests in t0010 are inherently about mtime between the index itself and index entries. The "sleep" in that test must stay as they are. Signed-off-by: Junio C Hamano <gitster@pobox.com>
58 lines
1.5 KiB
Bash
Executable file
58 lines
1.5 KiB
Bash
Executable file
#!/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
|
|
|
|
GIT_AUTHOR_EMAIL=bogus_email_address
|
|
export GIT_AUTHOR_EMAIL
|
|
|
|
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 &&
|
|
test_tick &&
|
|
git commit -m "Add A." &&
|
|
|
|
git checkout -b my-topic-branch &&
|
|
|
|
echo Second > B &&
|
|
git update-index --add B &&
|
|
test_tick &&
|
|
git commit -m "Add B." &&
|
|
|
|
echo AnotherSecond > C &&
|
|
git update-index --add C &&
|
|
test_tick &&
|
|
git commit -m "Add C." &&
|
|
|
|
git checkout -f master &&
|
|
rm -f B C &&
|
|
|
|
echo Third >> A &&
|
|
git update-index A &&
|
|
test_tick &&
|
|
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
|