t / t3505-cherry-pick-empty.shon commit merge-one-file: fix broken merges with alternate work trees (6aaeca9)
   1#!/bin/sh
   2
   3test_description='test cherry-picking an empty commit'
   4
   5. ./test-lib.sh
   6
   7test_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
  20test_expect_success 'cherry-pick an empty commit' '
  21        git checkout master && {
  22                git cherry-pick empty-branch
  23                test "$?" = 1
  24        }
  25'
  26
  27test_expect_success 'index lockfile was removed' '
  28
  29        test ! -f .git/index.lock
  30
  31'
  32
  33test_done