t/t3500-cherry.sh

   1 #!/bin/sh
   2 #
   3 # Copyright (c) 2006 Yann Dirson, based on t3400 by Amos Waterland
   4 #
   5
   6 test_description='git-cherry should detect patches integrated upstream
   7
   8 This test cherry-picks one local change of two into master branch, and
   9 checks that git-cherry only returns the second patch in the local branch
  10 '
  11 . ./test-lib.sh
  12
  13 export GIT_AUTHOR_EMAIL=bogus_email_address
  14
  15 test_expect_success \
  16     'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
  17     'echo First > A &&
  18      git-update-index --add A &&
  19      git-commit -m "Add A." &&
  20
  21      git-checkout -b my-topic-branch &&
  22
  23      echo Second > B &&
  24      git-update-index --add B &&
  25      git-commit -m "Add B." &&
  26
  27      sleep 2 &&
  28      echo AnotherSecond > C &&
  29      git-update-index --add C &&
  30      git-commit -m "Add C." &&
  31
  32      git-checkout -f master &&
  33
  34      echo Third >> A &&
  35      git-update-index A &&
  36      git-commit -m "Modify A." &&
  37
  38      expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* + .*"
  39 '
  40
  41 test_expect_success \
  42     'check that cherry with limit returns only the top patch'\
  43     'expr "$(echo $(git-cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
  44 '
  45
  46 test_expect_success \
  47     'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
  48     'git-cherry-pick my-topic-branch^0 &&
  49      echo $(git-cherry master my-topic-branch) &&
  50      expr "$(echo $(git-cherry master my-topic-branch) )" : "+ [^ ]* - .*"
  51 '
  52
  53 test_done