@matheusbsbs / matheus-bagliano / commits / b9d66899a9

am --skip/--abort: merge HEAD/ORIG_HEAD tree into index

f8da6801 (am --skip: support skipping while on unborn branch, 2015-06-06) introduced a performance regression to "git am --skip", where it used "read-tree" to reconstruct the index from scratch without reusing the cached stat information. This is a backport of the corresponding patch to the builtin am in 2.6: 3ecc704 (am --skip/--abort: merge HEAD/ORIG_HEAD tree into index, 2015-08-19). Reportedly, it can make a huge difference on Windows, in one case a `git rebase --skip` took 1m40s without, and 5s with, this patch. cf. https://github.com/git-for-windows/git/issues/365 Reported-and-suggested-by: Kim Gybels <kgybels@infogroep.be> Acked-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Johannes Schindelin committed Sep 9, 2015 at 09:10 UTC b9d66899a992525f2de9436e160779844ecfa2f1

1 file changed +1 -1

git-am.sh

+1 -1

@@ -509,7 +509,7 @@ then

509 git read-tree --reset -u $head_tree $head_tree &&

510 index_tree=$(git write-tree) &&

511 git read-tree -m -u $index_tree $head_tree

512 - git read-tree $head_tree

512 + git read-tree -m $head_tree

513 ;;

514 ,t)

515 if test -f "$dotest/rebasing"