]> git.ipfire.org Git - thirdparty/git.git/commit - builtin/merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: af6b65d) | patch
merge: optimization to skip evaluate_result for single strategy
authorAndrew Ng <andrew.ng@sony.com>
Tue, 19 May 2020 13:05:35 +0000 (14:05 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 May 2020 22:35:46 +0000 (15:35 -0700)
commit8777616e4db2868609bc42a4c66cc69d23532dbc
tree2bf472dd0563ed2c98c8420f0aa8e7fb02738275tree | snapshot
parentaf6b65d45ef179ed52087e80cb089f6b2349f4eccommit | diff
merge: optimization to skip evaluate_result for single strategy

For a merge with a single strategy, the result of evaluate_result() is
effectively not used and therefore is not needed, so avoid altogether.

On Windows, this optimization can halve the time required to perform a
recursive merge of a single commit with the LLVM repo.

Signed-off-by: Andrew Ng <andrew.ng@sony.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.