From: Azeem Bande-Ali <me@azeemba.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Azeem Bande-Ali via GitGitGadget <gitgitgadget@gmail.com>,
git@vger.kernel.org, David Barr <b@rr-dav.id.au>
Subject: Re: [PATCH] help.c: help.autocorrect=prompt waits for user action
Date: Fri, 13 Aug 2021 23:07:26 -0400 [thread overview]
Message-ID: <CABye9140=jnkERq8MLEcr_umW1+oaE5Wi39_iQnM3jevV3Hraw@mail.gmail.com> (raw)
In-Reply-To: <xmqqh7fu314a.fsf@gitster.g>
On Thu, Aug 12, 2021 at 3:38 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> If we cannot yet come to consensus that disabling autocorrection
> when running non-interactively is a good idea, at least we should be
> able to do so only for _PROMPT case, like the attached patch at the
> end.
Thanks for the suggestion. I think it makes sense to skip the autocorrection
completely when the setting is "prompt" and the user is not running
interactively.
> > + fprintf_ln(stderr, _("Assuming you meant: '%s'."),
> > + assumed);
> > + answer = git_prompt(_("Continue? (y/N)"), PROMPT_ECHO);
>
> Hmph, the above does not look WRONG per-se, but I wonder if it is
> easier for the users to see a single line, e.g.
>
> struct strbuf msg = STRBUF_INIT;
> strbuf_addf(&msg, _("Run '%s' instead? (y/N)"), assumed);
> answer = git_prompt(msg.buf, PROMPT_ECHO);
> strbuf_release(&msg);
>
I looked at the behavior for other settings and they
all behave pretty compactly. So I think this suggested
solution does fit better.
> + /*
> + * Disable autocorrection prompt in a non-interactive session
> + */
> + if ((autocorrect != AUTOCORRECT_PROMPT) &&
> + (!isatty(0) || !isatty(2)))
> + autocorrect = AUTOCORRECT_NEVER;
> +
That should be `(autocorrect == AUTOCORRECT_PROMPT)` right?
So we skip the autocorrect if the user is not running interactively
and has the "prompt" setting.
Thanks for all the feedback! I will send out a patch incorporating
this feedback soon.
next prev parent reply other threads:[~2021-08-14 3:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-11 0:15 [PATCH] help.c: help.autocorrect=prompt waits for user action Azeem Bande-Ali via GitGitGadget
2021-08-12 10:52 ` Bagas Sanjaya
2021-08-14 2:57 ` Azeem Bande-Ali
2021-08-12 19:37 ` Junio C Hamano
2021-08-14 3:07 ` Azeem Bande-Ali [this message]
2021-08-14 5:11 ` [PATCH v2] " Azeem Bande-Ali via GitGitGadget
2021-08-14 5:50 ` Bagas Sanjaya
2021-08-14 18:20 ` Junio C Hamano
2021-08-14 18:40 ` Azeem Bande-Ali
2021-08-16 12:28 ` Johannes Schindelin
2021-08-15 1:50 ` [PATCH v3] " Azeem Bande-Ali via GitGitGadget
2021-09-08 0:18 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CABye9140=jnkERq8MLEcr_umW1+oaE5Wi39_iQnM3jevV3Hraw@mail.gmail.com' \
--to=me@azeemba.com \
--cc=b@rr-dav.id.au \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).