t/t4121-apply-diffs.sh

   1 #!/bin/sh
   2
   3 test_description='git apply for contextually independent diffs'
   4 . ./test-lib.sh
   5
   6 test_done
   7
   8 echo '1
   9 2
  10 3
  11 4
  12 5
  13 6
  14 7
  15 8' >file
  16
  17 test_expect_success 'setup' \
  18         'git add file &&
  19         git commit -q -m 1 &&
  20         git checkout -b test &&
  21         mv file file.tmp &&
  22         echo 0 >file &&
  23         cat file.tmp >>file &&
  24         rm file.tmp &&
  25         git commit -a -q -m 2 &&
  26         echo 9 >>file &&
  27         git commit -a -q -m 3 &&
  28         git checkout master'
  29
  30 test_expect_success \
  31         'check if contextually independent diffs for the same file apply' \
  32         '( git diff test~2 test~1; git diff test~1 test~0 )| git apply'
  33
  34 test_done