t / t1008-read-tree-overlay.shon commit Merge tag 'gitgui-0.21.0' of git://repo.or.cz/git-gui (3eae308)
   1#!/bin/sh
   2
   3test_description='test multi-tree read-tree without merging'
   4
   5. ./test-lib.sh
   6. "$TEST_DIRECTORY"/lib-read-tree.sh
   7
   8test_expect_success setup '
   9        echo one >a &&
  10        git add a &&
  11        git commit -m initial &&
  12        git tag initial &&
  13        echo two >b &&
  14        git add b &&
  15        git commit -m second &&
  16        git checkout -b side initial &&
  17        echo three >a &&
  18        mkdir b &&
  19        echo four >b/c &&
  20        git add b/c &&
  21        git commit -m third
  22'
  23
  24test_expect_success 'multi-read' '
  25        read_tree_must_succeed initial master side &&
  26        (echo a; echo b/c) >expect &&
  27        git ls-files >actual &&
  28        test_cmp expect actual
  29'
  30
  31test_done
  32