Merge branch 'master' into next

diff --git a/t/t1002-read-tree-m-u-2way.sh b/t/t1002-read-tree-m-u-2way.sh
index 2f1ee7969816ed412f3d69a35b89dc29d84c2884..4d175d8ea1d7a83d0b77cc0bf0e62f9638d40d89 100755 (executable)
--- a/t/t1002-read-tree-m-u-2way.sh
+++ b/t/t1002-read-tree-m-u-2way.sh
@@ -20,7 +20,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" ;;
@@ -40,13 +40,13 @@ test_expect_success \
      echo bozbar >bozbar &&
      echo rezrov >rezrov &&
      echo yomin >yomin &&
-     git-update-cache --add nitfol bozbar rezrov &&
+     git-update-index --add nitfol bozbar rezrov &&
      treeH=`git-write-tree` &&
      echo treeH $treeH &&
      git-ls-tree $treeH &&
 
      echo gnusto >bozbar &&
-     git-update-cache --add frotz bozbar --force-remove rezrov &&
+     git-update-index --add frotz bozbar --force-remove rezrov &&
      git-ls-files --stage >M.out &&
      treeM=`git-write-tree` &&
      echo treeM $treeM &&
@@ -71,9 +71,9 @@ echo '+100644 X 0     yomin' >expected
 test_expect_success \
     '4 - carry forward local addition.' \
     'rm -f .git/index &&
-     git-update-cache --add yomin &&
+     git-update-index --add yomin &&
      git-read-tree -m -u $treeH $treeM &&
-     git-ls-files --stage >4.out || exit
+     git-ls-files --stage >4.out || return 1
      diff --unified=0 M.out 4.out >4diff.out
      compare_change 4diff.out expected &&
      check_cache_at yomin clean &&
@@ -87,10 +87,10 @@ test_expect_success \
     '5 - carry forward local addition.' \
     'rm -f .git/index &&
      echo yomin >yomin &&
-     git-update-cache --add yomin &&
+     git-update-index --add yomin &&
      echo yomin yomin >yomin &&
      git-read-tree -m -u $treeH $treeM &&
-     git-ls-files --stage >5.out || exit
+     git-ls-files --stage >5.out || return 1
      diff --unified=0 M.out 5.out >5diff.out
      compare_change 5diff.out expected &&
      check_cache_at yomin dirty &&
@@ -104,7 +104,7 @@ test_expect_success \
 test_expect_success \
     '6 - local addition already has the same.' \
     'rm -f .git/index &&
-     git-update-cache --add frotz &&
+     git-update-index --add frotz &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >6.out &&
      diff --unified=0 M.out 6.out &&
@@ -119,7 +119,7 @@ test_expect_success \
     '7 - local addition already has the same.' \
     'rm -f .git/index &&
      echo frotz >frotz &&
-     git-update-cache --add frotz &&
+     git-update-index --add frotz &&
      echo frotz frotz >frotz &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >7.out &&
@@ -136,14 +136,14 @@ test_expect_success \
     '8 - conflicting addition.' \
     'rm -f .git/index &&
      echo frotz frotz >frotz &&
-     git-update-cache --add frotz &&
+     git-update-index --add frotz &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
 test_expect_success \
     '9 - conflicting addition.' \
     'rm -f .git/index &&
      echo frotz frotz >frotz &&
-     git-update-cache --add frotz &&
+     git-update-index --add frotz &&
      echo frotz >frotz &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
@@ -151,7 +151,7 @@ test_expect_success \
     '10 - path removed.' \
     'rm -f .git/index &&
      echo rezrov >rezrov &&
-     git-update-cache --add rezrov &&
+     git-update-index --add rezrov &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >10.out &&
      cmp M.out 10.out &&
@@ -162,7 +162,7 @@ test_expect_success \
     '11 - dirty path removed.' \
     'rm -f .git/index &&
      echo rezrov >rezrov &&
-     git-update-cache --add rezrov &&
+     git-update-index --add rezrov &&
      echo rezrov rezrov >rezrov &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
@@ -170,14 +170,14 @@ test_expect_success \
     '12 - unmatching local changes being removed.' \
     'rm -f .git/index &&
      echo rezrov rezrov >rezrov &&
-     git-update-cache --add rezrov &&
+     git-update-index --add rezrov &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
 test_expect_success \
     '13 - unmatching local changes being removed.' \
     'rm -f .git/index &&
      echo rezrov rezrov >rezrov &&
-     git-update-cache --add rezrov &&
+     git-update-index --add rezrov &&
      echo rezrov >rezrov &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
@@ -190,9 +190,9 @@ test_expect_success \
     '14 - unchanged in two heads.' \
     'rm -f .git/index &&
      echo nitfol nitfol >nitfol &&
-     git-update-cache --add nitfol &&
+     git-update-index --add nitfol &&
      git-read-tree -m -u $treeH $treeM &&
-     git-ls-files --stage >14.out || exit
+     git-ls-files --stage >14.out || return 1
      diff --unified=0 M.out 14.out >14diff.out
      compare_change 14diff.out expected &&
      sum bozbar frotz >actual14.sum &&
@@ -209,10 +209,10 @@ test_expect_success \
     '15 - unchanged in two heads.' \
     'rm -f .git/index &&
      echo nitfol nitfol >nitfol &&
-     git-update-cache --add nitfol &&
+     git-update-index --add nitfol &&
      echo nitfol nitfol nitfol >nitfol &&
      git-read-tree -m -u $treeH $treeM &&
-     git-ls-files --stage >15.out || exit
+     git-ls-files --stage >15.out || return 1
      diff --unified=0 M.out 15.out >15diff.out
      compare_change 15diff.out expected &&
      check_cache_at nitfol dirty &&
@@ -229,14 +229,14 @@ test_expect_success \
     '16 - conflicting local change.' \
     'rm -f .git/index &&
      echo bozbar bozbar >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
 test_expect_success \
     '17 - conflicting local change.' \
     'rm -f .git/index &&
      echo bozbar bozbar >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      echo bozbar bozbar bozbar >bozbar &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
@@ -244,7 +244,7 @@ test_expect_success \
     '18 - local change already having a good result.' \
     'rm -f .git/index &&
      echo gnusto >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >18.out &&
      diff --unified=0 M.out 18.out &&
@@ -256,7 +256,7 @@ test_expect_success \
     '19 - local change already having a good result, further modified.' \
     'rm -f .git/index &&
      echo gnusto >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      echo gnusto gnusto >bozbar &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >19.out &&
@@ -275,7 +275,7 @@ test_expect_success \
     '20 - no local change, use new tree.' \
     'rm -f .git/index &&
      echo bozbar >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      git-read-tree -m -u $treeH $treeM &&
      git-ls-files --stage >20.out &&
      diff --unified=0 M.out 20.out &&
@@ -287,7 +287,7 @@ test_expect_success \
     '21 - no local change, dirty cache.' \
     'rm -f .git/index &&
      echo bozbar >bozbar &&
-     git-update-cache --add bozbar &&
+     git-update-index --add bozbar &&
      echo gnusto gnusto >bozbar &&
      if git-read-tree -m -u $treeH $treeM; then false; else :; fi'
 
@@ -296,7 +296,7 @@ test_expect_success \
     'DF vs DF/DF case setup.' \
     'rm -f .git/index &&
      echo DF >DF &&
-     git-update-cache --add DF &&
+     git-update-index --add DF &&
      treeDF=`git-write-tree` &&
      echo treeDF $treeDF &&
      git-ls-tree $treeDF &&
@@ -304,7 +304,7 @@ test_expect_success \
      rm -f DF &&
      mkdir DF &&
      echo DF/DF >DF/DF &&
-     git-update-cache --add --remove DF DF/DF &&
+     git-update-index --add --remove DF DF/DF &&
      treeDFDF=`git-write-tree` &&
      echo treeDFDF $treeDFDF &&
      git-ls-tree $treeDFDF &&
@@ -315,7 +315,7 @@ test_expect_success \
     'rm -f .git/index &&
      rm -fr DF &&
      echo DF >DF &&
-     git-update-cache --add DF &&
+     git-update-index --add DF &&
      git-read-tree -m -u $treeDF $treeDFDF &&
      git-ls-files --stage >DFDFcheck.out &&
      diff --unified=0 DFDF.out DFDFcheck.out &&