Merge part of 'jc/cache-tree'

diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh
index d0ed24275e593e0decd2cdaf46617d5c3fc876e3..75e4c9a88657e4ea28e0b4dfb7cbb2c3eaaa2f3f 100755 (executable)
--- a/t/t1001-read-tree-m-2way.sh
+++ b/t/t1001-read-tree-m-2way.sh
@@ -37,7 +37,7 @@ compare_change () {
 }
 
 check_cache_at () {
-       clean_if_empty=`git-diff-files "$1"`
+       clean_if_empty=`git-diff-files -- "$1"`
        case "$clean_if_empty" in
        '')  echo "$1: clean" ;;
        ?*)  echo "$1: dirty" ;;