git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/4] am: drop tty requirement for --interactive

From
Jeff King <peff@peff.net>
Date
May 20, 2019, 12:50 UTC
Message-ID
<20190520125016.GA13474@sigill.intra.peff.net>
In-Reply-To
<20190520121113.GC11212@sigill.intra.peff.net>
On Mon, May 20, 2019 at 08:11:13AM -0400, Jeff King wrote:
> We have required that the stdin of "am --interactive" be a tty since
> a1451104ac (git-am: interactive should fail gracefully., 2005-10-12).
> However, this isn't strictly necessary, and makes the tool harder to
> test (and is unlike all of our other --interactive commands).

I think this is worth doing for simplicity and consistency. But as you might guess, my ulterior motive was making it easier to add tests.

In theory we _should_ be able to use test_terminal for this, but it seems to be racy, because it will quickly read all input and close the descriptor (to give the reader EOF). But after that close, isatty() will no longer report it correctly. E.g., if I run this:

  perl test-terminal.perl sh -c '
	for i in 0 1 2; do
		echo $i is $(test -t $i || echo not) a tty
	done
  ' </dev/null

it _usually_ says "0 is a tty", but racily may say "not a tty". If you put a sleep into the beginning of the shell, then it will basically always lose the race and say "not".

It might be possible to overcome this by making test-terminal more clever (i.e., is there a way for us to send an "EOF" over the pty without actually _closing_ it? That would behave like a real terminal, where you can hit ^D to generate an EOF but then type more).

But barring that, this works by just avoiding it entirely. :)

Curiously, my script above also reports consistently that stdout is not a tty, but that stderr is. I'm not sure why this is, but it no tests seem to care either way.

-Peff
Previous: Jeff KingNext: Johannes Schindelin
Message 7 of 30 in “Abort (core dumped)”
  1. Alejandro SanchezMay 20, 2019
  2. Jeff KingMay 20, 2019
  3. 0/4 fix BUG() with "git am -i --resolved"Jeff King, May 20, 2019
  4. 1/4 am: simplify prompt response handlingJeff King, May 20, 2019
  5. 2/4 am: read interactive input from stdinJeff King, May 20, 2019
  6. 3/4 am: drop tty requirement for --interactiveJeff King, May 20, 2019
  7. Jeff KingMay 20, 2019
  8. Johannes SchindelinMay 23, 2019
  9. Jeff KingMay 24, 2019
  10. 0/2 prompt.c: split up git_prompt(), read from /dev/tty, not STDINÆvar Arnfjörð Bjarmason, Nov 2, 2021
  11. 1/2 prompt.c: split up the password and non-password handlingÆvar Arnfjörð Bjarmason, Nov 2, 2021
  12. Jeff KingNov 3, 2021
  13. Junio C HamanoNov 3, 2021
  14. 2/2 prompt.c: add and use a GIT_TEST_TERMINAL_PROMPT=trueÆvar Arnfjörð Bjarmason, Nov 2, 2021
  15. Jeff KingNov 3, 2021
  16. Ævar Arnfjörð BjarmasonNov 3, 2021
  17. Jeff KingNov 4, 2021
  18. Junio C HamanoNov 3, 2021
  19. Johannes SchindelinNov 4, 2021
  20. Jeff KingNov 4, 2021
  21. Jeff KingNov 4, 2021
  22. 4/4 am: fix --interactive HEAD tree resolutionJeff King, May 20, 2019
  23. Johannes SchindelinMay 23, 2019
  24. Jeff KingMay 24, 2019
  25. 4/4 am: fix --interactive HEAD tree resolutionJeff King, May 24, 2019
  26. Johannes SchindelinMay 28, 2019
  27. Jeff KingMay 28, 2019
  28. Johannes SchindelinMay 29, 2019
  29. Alejandro SanchezSep 26, 2019
  30. Jeff KingSep 26, 2019

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.