t/t6029-merge-subtree.sh

   1 #!/bin/sh
   2
   3 test_description='subtree merge strategy'
   4
   5 . ./test-lib.sh
   6
   7 test_expect_success setup '
   8
   9         s="1 2 3 4 5 6 7 8"
  10         for i in $s; do echo $i; done >hello &&
  11         git add hello &&
  12         git commit -m initial &&
  13         git checkout -b side &&
  14         echo >>hello world &&
  15         git add hello &&
  16         git commit -m second &&
  17         git checkout master &&
  18         for i in mundo $s; do echo $i; done >hello &&
  19         git add hello &&
  20         git commit -m master
  21
  22 '
  23
  24 test_expect_success 'subtree available and works like recursive' '
  25
  26         git merge -s subtree side &&
  27         for i in mundo $s world; do echo $i; done >expect &&
  28         diff -u expect hello
  29
  30 '
  31
  32 test_done