'
test_expect_success \
- 'update-cache --add a file.' \
- 'git-update-index --add path0'
+ 'update-index --add a file.' \
+ 'git update-index --add path0'
test_expect_success \
'write that tree.' \
- 'tree=$(git-write-tree) && echo $tree'
+ 'tree=$(git write-tree) && echo $tree'
sed -e 's/line/Line/' <path0 >path1
rm -f path0
test_expect_success \
'renamed and edited the file.' \
- 'git-update-index --add --remove path0 path1'
+ 'git update-index --add --remove path0 path1'
test_expect_success \
- 'git-diff-index -p -M after rename and editing.' \
- 'git-diff-index -p -M $tree >current'
+ 'git diff-index -p -M after rename and editing.' \
+ 'git diff-index -p -M $tree >current'
cat >expected <<\EOF
diff --git a/path0 b/path1
rename from path0
git rm path1 &&
mkdir subdir &&
git mv another-path subdir/path1 &&
- git runstatus | grep "renamed: .*path1 -> subdir/path1"'
+ git status | grep "renamed: .*path1 -> subdir/path1"'
test_expect_success 'favour same basenames even with minor differences' '
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
- git runstatus | grep "renamed: .*path1 -> subdir/path1"'
+ git status | grep "renamed: .*path1 -> subdir/path1"'
test_done