t/t3505-cherry-pick-empty.sh

   1 #!/bin/sh
   2
   3 test_description='test cherry-picking an empty commit'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success setup '
   8
   9         echo first > file1 &&
  10         git add file1 &&
  11         test_tick &&
  12         git commit -m "first" &&
  13
  14         git checkout -b empty-branch &&
  15         test_tick &&
  16         git commit --allow-empty -m "empty"
  17
  18 '
  19
  20 test_expect_code 1 'cherry-pick an empty commit' '
  21
  22         git checkout master &&
  23         git cherry-pick empty-branch
  24
  25 '
  26
  27 test_expect_success 'index lockfile was removed' '
  28
  29         test ! -f .git/index.lock
  30
  31 '
  32
  33 test_done