Merge branch 'js/apply-build-ancestor'

* js/apply-build-ancestor:
apply: get rid of --index-info in favor of --build-fake-ancestor

diff --combined git-am.sh
index b66173c0cd8e7908c1ac9ffc9c9a6a91160849a0,5599b9358402125e9901cc7dac96d319da16f43c..32c46d7ed4b26220f4c9e7fc778bb240c85dae1c
--- 1/git-am.sh
--- 2/git-am.sh
+++ b/git-am.sh
@@@ -62,10 -62,8 +62,8 @@@ fall_back_3way () 
      mkdir "$dotest/patch-merge-tmp-dir"
  
      # First see if the patch records the index info that we can use.
-     git apply -z --index-info "$dotest/patch" \
-       >"$dotest/patch-merge-index-info" &&
-     GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
-     git update-index -z --index-info <"$dotest/patch-merge-index-info" &&
+     git apply --build-fake-ancestor "$dotest/patch-merge-tmp-index" \
+       "$dotest/patch" &&
      GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
      git write-tree >"$dotest/patch-merge-base+" ||
      cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge."
@@@ -109,7 -107,7 +107,7 @@@ dotest=.dotest sign= utf8=t keep= skip
  resolvemsg= resume=
  git_apply_opt=
  
 -while case "$#" in 0) break;; esac
 +while test $# != 0
  do
        case "$1" in
        -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)