t / t3503-cherry-pick-root.shon commit t6022: Add tests with both rename source & dest involved in D/F conflicts (588504b)
   1#!/bin/sh
   2
   3test_description='test cherry-picking a root 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 symbolic-ref HEAD refs/heads/second &&
  15        rm .git/index file1 &&
  16        echo second > file2 &&
  17        git add file2 &&
  18        test_tick &&
  19        git commit -m "second"
  20
  21'
  22
  23test_expect_success 'cherry-pick a root commit' '
  24
  25        git cherry-pick master &&
  26        test first = $(cat file1)
  27
  28'
  29
  30test_done