Re: [PATCH 02/16] update-index: convert advise() messages back to warning()
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 14, 2022, 06:08 UTC
- Message-ID
- <xmqq5yoht6an.fsf@gitster.g>
- In-Reply-To
- <b120972a441d3081519af0e31bb0c639df148287.1647033303.git.gitgitgadget@gmail.com>
"Jeff Hostetler via GitGitGadget" <gitgitgadget@gmail.com> writes:
> From: Jeff Hostetler <jeffhost@microsoft.com> > > fixup! update-index: convert fsmonitor warnings to advise
Same comment as 01/16 applies here. "convert ... back to ..." in the title refers to the fact that builtin-fsmonitor-part2 topic turned warning() into advise() without a good justification, I think. Flipping and flopping between warning and advise, without giving any justification going either direction, is not a good move.
I only have looked at one eighth of this part 2.5, but it starts to look that ejecting part-2 and redoing it may result in a cleaner code that is easier to understand, perhaps? For example, instead of applying this patch, we can just get rid of 1a9241e1 (update-index: convert fsmonitor warnings to advise, 2022-03-01). As I read more, my impression will certainly change, I would expect. Let's see.
Show 34 quoted lines
> Signed-off-by: Jeff Hostetler <jeffhost@microsoft.com>
> ---
> builtin/update-index.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/builtin/update-index.c b/builtin/update-index.c
> index d335f1ac72a..75d646377cc 100644
> --- a/builtin/update-index.c
> +++ b/builtin/update-index.c
> @@ -1238,18 +1238,18 @@ int cmd_update_index(int argc, const char **argv, const char *prefix)
> if (fsmonitor > 0) {
> enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
> if (fsm_mode == FSMONITOR_MODE_DISABLED) {
> - advise(_("core.fsmonitor is unset; "
> - "set it if you really want to "
> - "enable fsmonitor"));
> + warning(_("core.fsmonitor is unset; "
> + "set it if you really want to "
> + "enable fsmonitor"));
> }
> add_fsmonitor(&the_index);
> report(_("fsmonitor enabled"));
> } else if (!fsmonitor) {
> enum fsmonitor_mode fsm_mode = fsm_settings__get_mode(r);
> if (fsm_mode > FSMONITOR_MODE_DISABLED)
> - advise(_("core.fsmonitor is set; "
> - "remove it if you really want to "
> - "disable fsmonitor"));
> + warning(_("core.fsmonitor is set; "
> + "remove it if you really want to "
> + "disable fsmonitor"));
> remove_fsmonitor(&the_index);
> report(_("fsmonitor disabled"));
> }