diff options
| author | Jeff King <peff@peff.net> | 2023-08-31 17:17:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-08-31 15:07:10 -0700 |
| commit | dee02da8264bf7e47c8f2689663fac98d31ee450 (patch) | |
| tree | 6dd0682232fd411adfc6e5405d363101b247bc15 /commit-graph.c | |
| parent | The fourth batch (diff) | |
| download | git-dee02da8264bf7e47c8f2689663fac98d31ee450.tar.gz git-dee02da8264bf7e47c8f2689663fac98d31ee450.zip | |
merge: make xopts a strvec
The "xopts" variable uses a custom array with ALLOC_GROW(). Using a
strvec simplifies things a bit. We need fewer variables, and we can also
ditch our custom parseopt callback in favor of OPT_STRVEC().
As a bonus, this means that "--no-strategy-option", which was previously
a silent noop, now does something useful: like other list-like options,
it will clear the list of -X options seen so far. This matches the
behavior of revert/cherry-pick, which made the same change in fb60b9f37f
(sequencer: use struct strvec to store merge strategy options,
2023-04-10).
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit-graph.c')
0 files changed, 0 insertions, 0 deletions