t / t4010-diff-pathspec.shon commit checkout -m path: fix recreating conflicts (6d6f9ac)
   1#!/bin/sh
   2#
   3# Copyright (c) 2005 Junio C Hamano
   4#
   5
   6test_description='Pathspec restrictions
   7
   8Prepare:
   9        file0
  10        path1/file1
  11'
  12. ./test-lib.sh
  13. "$TEST_DIRECTORY"/diff-lib.sh ;# test-lib chdir's into trash
  14
  15test_expect_success \
  16    setup \
  17    'echo frotz >file0 &&
  18     mkdir path1 &&
  19     echo rezrov >path1/file1 &&
  20     git update-index --add file0 path1/file1 &&
  21     tree=`git write-tree` &&
  22     echo "$tree" &&
  23     echo nitfol >file0 &&
  24     echo yomin >path1/file1 &&
  25     git update-index file0 path1/file1'
  26
  27cat >expected <<\EOF
  28EOF
  29test_expect_success \
  30    'limit to path should show nothing' \
  31    'git diff-index --cached $tree -- path >current &&
  32     compare_diff_raw current expected'
  33
  34cat >expected <<\EOF
  35:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M      path1/file1
  36EOF
  37test_expect_success \
  38    'limit to path1 should show path1/file1' \
  39    'git diff-index --cached $tree -- path1 >current &&
  40     compare_diff_raw current expected'
  41
  42cat >expected <<\EOF
  43:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M      path1/file1
  44EOF
  45test_expect_success \
  46    'limit to path1/ should show path1/file1' \
  47    'git diff-index --cached $tree -- path1/ >current &&
  48     compare_diff_raw current expected'
  49
  50cat >expected <<\EOF
  51:100644 100644 766498d93a4b06057a8e49d23f4068f1170ff38f 0a41e115ab61be0328a19b29f18cdcb49338d516 M      file0
  52EOF
  53test_expect_success \
  54    'limit to file0 should show file0' \
  55    'git diff-index --cached $tree -- file0 >current &&
  56     compare_diff_raw current expected'
  57
  58cat >expected <<\EOF
  59EOF
  60test_expect_success \
  61    'limit to file0/ should emit nothing.' \
  62    'git diff-index --cached $tree -- file0/ >current &&
  63     compare_diff_raw current expected'
  64
  65test_done