summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-09-23 21:16:33 -0700
committerJunio C Hamano <gitster@pobox.com>2007-09-23 21:16:33 -0700
commit52d5bc9a161f839b78ec06c25736d09703fda802 (patch)
tree8ef92ac1a031de4929da08ce29cc878d6525be31 /git-am.sh
parent4f337e24662f07513fd6e8388f27f13dbe44cadc (diff)
parent7a98869935a3682b5ff9679c92bf9bc12f87d8c5 (diff)
downloadgit-52d5bc9a161f839b78ec06c25736d09703fda802.tar.gz
Merge branch 'js/apply-build-ancestor'
* js/apply-build-ancestor: apply: get rid of --index-info in favor of --build-fake-ancestor
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh6
1 files changed, 2 insertions, 4 deletions
diff --git a/git-am.sh b/git-am.sh
index b66173c0cd..32c46d7ed4 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -62,10 +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."