merge: optimization to skip evaluate_result for single strategy
PATCH 1/1 merge: optimization to skip evaluate_result for single strategy
From: Andrew Ng <[email protected]>
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 <[email protected]>
Reviewed-by Junio C Hamano <[email protected]>
--- builtin/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
builtin/merge.c +1 -1
@@ -1656,7 +1656,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) } merge_was_ok =1 ; } - cnt =evaluate_result (); + cnt = (use_strategies_nr >1 ) ?evaluate_result () :0 ;if (best_cnt <=0 || cnt <= best_cnt) { best_strategy = use_strategies[i]->name; best_cnt = cnt;
Signature · 1 line
2.26.2.windows.1