From: Karl Hasselström <kha@treskal.com>
Date: Wed, 23 Jul 2008 21:29:09 +0000 (+0200)
Subject: Do simple in-index merge with diff+apply instead of read-tree
X-Git-Tag: v0.15-rc1~193
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/bc1ecd0bb28c457634ea5ea747c55945d1aa1997?hp=bc1ecd0bb28c457634ea5ea747c55945d1aa1997

Do simple in-index merge with diff+apply instead of read-tree

The advantage is that patch application will resolve some file content
conflicts for us, so that we'll fall back to merge-recursive less
often. This is a significant speedup, especially since merge-recursive
needs to touch the worktree, which means we have to check out the
index first.

(A simple test, pushing 250 patches in a 32k-file repository, with one
file-level merge necessary per push, went from 1.07 to 0.36 seconds
per patch with this patch applied.)

Signed-off-by: Karl Hasselström <kha@treskal.com>
---