diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-01-21 17:21:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-21 17:21:59 -0800 |
| commit | df786f6efeaa302fa0bf1d39f46fe2528103e9bc (patch) | |
| tree | 6d5d298764064c373816cd42079f1f729cc60652 | |
| parent | Merge branch 'jk/interop-error' (diff) | |
| parent | merge: break out of all_strategy loop when strategy is found (diff) | |
| download | git-df786f6efeaa302fa0bf1d39f46fe2528103e9bc.tar.gz git-df786f6efeaa302fa0bf1d39f46fe2528103e9bc.zip | |
Merge branch 'sk/merge-filtering-strategies-micro-optim'
Micro optimization.
* sk/merge-filtering-strategies-micro-optim:
merge: break out of all_strategy loop when strategy is found
| -rw-r--r-- | builtin/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 0f093f2a4f..74de2ebd2b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -188,7 +188,7 @@ static struct strategy *get_strategy(const char *name) for (i = 0; i < main_cmds.cnt; i++) { int j, found = 0; struct cmdname *ent = main_cmds.names[i]; - for (j = 0; j < ARRAY_SIZE(all_strategy); j++) + for (j = 0; !found && j < ARRAY_SIZE(all_strategy); j++) if (!strncmp(ent->name, all_strategy[j].name, ent->len) && !all_strategy[j].name[ent->len]) found = 1; |