diff options
| author |  Martin von Zweigbergk <martinvonz@gmail.com> | 2012-12-20 13:03:36 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-12-20 13:07:22 -0800 |
| commit | 686b2de0ceb2c5a1fb6c8822a8aceb8a05e2fc76 (patch) | |
| tree | b621f7c3d0814d6658c86fa54a0773104e5ec9f3 /Documentation/RelNotes/1.7.10.1.txt | |
| parent | Git 1.7.12.4 (diff) | |
| download | tgif-686b2de0ceb2c5a1fb6c8822a8aceb8a05e2fc76.tar.xz | |
oneway_merge(): only lstat() when told to update worktree
Although the subject line of 613f027 (read-tree -u one-way merge fix
to check out locally modified paths., 2006-05-15) mentions "read-tree
-u", it did not seem to check whether -u was in effect. Not checking
whether -u is in effect makes e.g. "read-tree --reset" lstat() the
worktree, even though the worktree stat should not matter for that
operation.
This speeds up e.g. "git reset" a little on the linux-2.6 repo (best
of five, warm cache):
Before After
real 0m0.288s 0m0.233s
user 0m0.190s 0m0.150s
sys 0m0.090s 0m0.080s
Signed-off-by: Martin von Zweigbergk <martinvonz@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/RelNotes/1.7.10.1.txt')
0 files changed, 0 insertions, 0 deletions