diff options
| author | Andrew Ng <andrew.ng@sony.com> | 2020-05-19 14:05:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-05-19 15:35:46 -0700 |
| commit | 8777616e4db2868609bc42a4c66cc69d23532dbc (patch) | |
| tree | 2bf472dd0563ed2c98c8420f0aa8e7fb02738275 /combine-diff.c | |
| parent | af6b65d45ef179ed52087e80cb089f6b2349f4ec (diff) | |
| download | git-8777616e4db2868609bc42a4c66cc69d23532dbc.tar.gz | |
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>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions