From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 24 Sep 2007 04:16:33 +0000 (-0700)
Subject: Merge branch 'js/apply-build-ancestor'
X-Git-Tag: v1.5.4-rc0~422
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/52d5bc9a161f839b78ec06c25736d09703fda802?ds=inline;hp=-c

Merge branch 'js/apply-build-ancestor'

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

52d5bc9a161f839b78ec06c25736d09703fda802
diff --combined git-am.sh
index b66173c0cd,5599b93584..32c46d7ed4
--- a/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=*)