mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'an/merge-single-strategy-optim'
Code optimization for a common case. * an/merge-single-strategy-optim: merge: optimization to skip evaluate_result for single strategy
This commit is contained in:
commit
0739479c6a
|
@ -1656,7 +1656,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix)
|
||||||
}
|
}
|
||||||
merge_was_ok = 1;
|
merge_was_ok = 1;
|
||||||
}
|
}
|
||||||
cnt = evaluate_result();
|
cnt = (use_strategies_nr > 1) ? evaluate_result() : 0;
|
||||||
if (best_cnt <= 0 || cnt <= best_cnt) {
|
if (best_cnt <= 0 || cnt <= best_cnt) {
|
||||||
best_strategy = use_strategies[i]->name;
|
best_strategy = use_strategies[i]->name;
|
||||||
best_cnt = cnt;
|
best_cnt = cnt;
|
||||||
|
|
Loading…
Reference in a new issue