Andrew's git - gitweb.git/blob

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