diff --git a/git-am.sh b/git-am.sh
index b66173c0cd8e7908c1ac9ffc9c9a6a91160849a0..b02ae6a76fa8265da1ea3d720df9dc29cc5d5519 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
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."
"$GIT_DIR"/hooks/post-applypatch
fi
+ git gc --auto
+
go_next
done