From: Carlo Arenas <carenas@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, phillip.wood123@gmail.com,
thomas.wolf@paranor.ch, Alexander Veit <alexander.veit@gmx.net>
Subject: Re: [PATCH] editor: only save (and restore) the terminal if using a tty
Date: Mon, 22 Nov 2021 15:39:12 -0800 [thread overview]
Message-ID: <CAPUEspgDafXHHPvzNijTsPsna76yE8W=JH-78LX3jyaieSmp0A@mail.gmail.com> (raw)
In-Reply-To: <xmqqa6hvbxob.fsf@gitster.g>
On Mon, Nov 22, 2021 at 3:03 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Carlo Marcelo Arenas Belón <carenas@gmail.com> writes:
>
> > If the editor is invoked without a controlling terminal, then
> > saving the state and restoring it later is not very useful and
> > could generate signals that the invoking process wouldn't know
> > how to handle.
> >
> > if git's standard output is not connected to a terminal, then
> > presume there is no need to worry if the invoking terminal could
> > garble it.
>
> Shouldn't the logic apply equally to all callers of save_term()?
>
> In other words, why aren't we doing this check inside save_term()
> implementation? i.e. before opening /dev/tty, we can do isatty(1)
> and return -1 if it is false, or something? That way, when we gain
> the second caller to save/restore other than editor (prehaps the
> pager code path wants to do this? I dunno), we do not have to
> remember that isatty() check must be made before doing save_term(),
> no?
yes, my plan was to minimize the impact of this bugfix by doing this
as narrow as possible, but you are correct that if we consider that
the only caller for save_term() is in editor.c then it would had make
more sense to put it there to begin with and with supportability in
mind for the future; but save_term() is also called internally, and so
the logic would also propagate to other places that use
compat/terminal.c (like our fallback version of getpass() or `git add
-p`).
I should have mentioned though that a better fix was forthcoming, just
not with so little time before 2.34.1 gets released.
> In any case, I am quite tempted to just revert the offending topic
> for now, but later accept a resurrection patch with this isatty
> check rolled in (either at this caller, or inside save_term) when
> the dust settles.
I indeed suggested[1] a revert but I wouldn't have proposed this
alternative if it wouldn't be done safely enough, agree though that
without a successful report that it fixes the problem by the reporter
(who has since moved[2] on to a different hack which was proposed by
Peff), a revert is always safer.
Carlo
[1] https://lore.kernel.org/git/xmqqilwjbyj4.fsf@gitster.g/T/#mad3fd4d0015ec939c1e0001444d5affd720d56b2
[2] https://git.eclipse.org/r/c/jgit/jgit/+/187938
next prev parent reply other threads:[~2021-11-22 23:39 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-22 8:42 Update to Git 2.34.0 breaks application Alexander Veit
2021-11-22 21:43 ` Phillip Wood
2021-11-22 22:28 ` [PATCH] editor: only save (and restore) the terminal if using a tty Carlo Marcelo Arenas Belón
2021-11-22 22:47 ` Junio C Hamano
2021-11-22 23:03 ` Junio C Hamano
2021-11-22 23:08 ` Junio C Hamano
2021-11-23 8:52 ` Alexander Veit
2021-11-23 9:08 ` Carlo Arenas
2021-11-22 23:39 ` Carlo Arenas [this message]
2021-11-23 17:35 ` Junio C Hamano
2021-11-24 13:29 ` Johannes Schindelin
2021-11-24 18:25 ` Carlo Arenas
2021-11-24 19:34 ` Junio C Hamano
2021-11-24 20:04 ` Carlo Arenas
2021-11-24 20:51 ` Junio C Hamano
2021-11-29 21:12 ` Johannes Schindelin
2021-11-23 11:05 ` Phillip Wood
2021-11-23 17:27 ` Junio C Hamano
2021-11-23 17:31 ` Carlo Arenas
2021-11-30 11:07 ` Phillip Wood
2021-12-01 5:12 ` Chris Torek
2021-12-01 19:33 ` Junio C Hamano
2021-12-02 0:38 ` Junio C Hamano
2021-12-02 1:51 ` Carlo Arenas
2021-12-02 14:48 ` Johannes Schindelin
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='CAPUEspgDafXHHPvzNijTsPsna76yE8W=JH-78LX3jyaieSmp0A@mail.gmail.com' \
--to=carenas@gmail.com \
--cc=alexander.veit@gmx.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=phillip.wood123@gmail.com \
--cc=thomas.wolf@paranor.ch \
/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).