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 GIT_AUTHOR_EMAIL=bogus_email_address
  14 export GIT_AUTHOR_EMAIL
  15
  16 test_expect_success \
  17     'prepare repository with topic branch, and check cherry finds the 2 patches from there' \
  18     'echo First > A &&
  19      git update-index --add A &&
  20      git commit -m "Add A." &&
  21
  22      git checkout -b my-topic-branch &&
  23
  24      echo Second > B &&
  25      git update-index --add B &&
  26      git commit -m "Add B." &&
  27
  28      sleep 2 &&
  29      echo AnotherSecond > C &&
  30      git update-index --add C &&
  31      git commit -m "Add C." &&
  32
  33      git checkout -f master &&
  34      rm -f B C &&
  35
  36      echo Third >> A &&
  37      git update-index A &&
  38      git commit -m "Modify A." &&
  39
  40      expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* + .*"
  41 '
  42
  43 test_expect_success \
  44     'check that cherry with limit returns only the top patch'\
  45     'expr "$(echo $(git cherry master my-topic-branch my-topic-branch^1) )" : "+ [^ ]*"
  46 '
  47
  48 test_expect_success \
  49     'cherry-pick one of the 2 patches, and check cherry recognized one and only one as new' \
  50     'git cherry-pick my-topic-branch^0 &&
  51      echo $(git cherry master my-topic-branch) &&
  52      expr "$(echo $(git cherry master my-topic-branch) )" : "+ [^ ]* - .*"
  53 '
  54
  55 test_done