diff options
| author |  Johannes Schindelin <johannes.schindelin@gmx.de> | 2015-09-09 09:10:07 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2015-09-09 14:22:56 -0700 |
| commit | b9d66899a992525f2de9436e160779844ecfa2f1 (patch) | |
| tree | da470b6ed366d38f51d7ef2e82a5bdefdf331f0c /t/t3502-cherry-pick-merge.sh | |
| parent | Git 2.4.9 (diff) | |
| download | tgif-b9d66899a992525f2de9436e160779844ecfa2f1.tar.xz | |
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>
Diffstat (limited to 't/t3502-cherry-pick-merge.sh')
0 files changed, 0 insertions, 0 deletions