diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-08-17 11:41:43 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-08-19 10:08:04 -0700 |
| commit | 45ef16f77ae5a14aa751d03c9c9fc2fa91804425 (patch) | |
| tree | 6d231ea404c0fea6eb90067fccb413b9eb421ccb /t/t3308-notes-merge.sh | |
| parent | merge-recursive: rename MERGE_RECURSIVE_* to MERGE_VARIANT_* (diff) | |
| download | tgif-45ef16f77ae5a14aa751d03c9c9fc2fa91804425.tar.xz | |
merge-recursive: add sanity checks for relevant merge_options
There are lots of options that callers can set, yet most have a limited
range of valid values, some options are meant for output (e.g.
opt->obuf, which is expected to start empty), and callers are expected
to not set opt->priv. Add several sanity checks to ensure callers
provide sane values.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions