t / t7001-mv.shon commit Merge branch 'jc/diff' into next (7be14b4)
   1#!/bin/sh
   2
   3test_description='git-mv in subdirs'
   4. ./test-lib.sh
   5
   6test_expect_success \
   7    'prepare reference tree' \
   8    'mkdir path0 path1 &&
   9     cp ../../COPYING path0/COPYING &&
  10     git-add path0/COPYING &&
  11     git-commit -m add -a'
  12
  13test_expect_success \
  14    'moving the file out of subdirectory' \
  15    'cd path0 && git-mv COPYING ../path1/COPYING'
  16
  17# in path0 currently
  18test_expect_success \
  19    'commiting the change' \
  20    'cd .. && git-commit -m move-out -a'
  21
  22test_expect_success \
  23    'checking the commit' \
  24    'git-diff-tree -r -M --name-status  HEAD^ HEAD | \
  25    grep -E "^R100.+path0/COPYING.+path1/COPYING"'
  26
  27test_expect_success \
  28    'moving the file back into subdirectory' \
  29    'cd path0 && git-mv ../path1/COPYING COPYING'
  30
  31# in path0 currently
  32test_expect_success \
  33    'commiting the change' \
  34    'cd .. && git-commit -m move-in -a'
  35
  36test_expect_success \
  37    'checking the commit' \
  38    'git-diff-tree -r -M --name-status  HEAD^ HEAD | \
  39    grep -E "^R100.+path1/COPYING.+path0/COPYING"'
  40
  41test_done