From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 14 Sep 2015 21:59:07 +0000 (-0700)
Subject: Merge branch 'js/maint-am-skip-performance-regression'
X-Git-Tag: v2.6.0-rc3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cf2094ca6349fe8cfe0f327e36ea386ad8ac98db?hp=b8367d1f012ceb86ab48c9024a1bac111bb52dde

Merge branch 'js/maint-am-skip-performance-regression'

Recent versions of scripted "git am" has a performance regression in
"git am --skip" codepath, which no longer exists in the built-in
version on the 'master' front.  Fix the regression in the last
scripted version that appear in 2.5.x maintenance track and older.

* js/maint-am-skip-performance-regression:
am --skip/--abort: merge HEAD/ORIG_HEAD tree into index
---

diff --git a/contrib/examples/git-am.sh b/contrib/examples/git-am.sh
index 3b77028123..dd539f1a8a 100755
--- a/contrib/examples/git-am.sh
+++ b/contrib/examples/git-am.sh
@@ -512,7 +512,7 @@ then
 		git read-tree --reset -u $head_tree $head_tree &&
 		index_tree=$(git write-tree) &&
 		git read-tree -m -u $index_tree $head_tree
-		git read-tree $head_tree
+		git read-tree -m $head_tree
 		;;
 	,t)
 		if test -f "$dotest/rebasing"