summaryrefslogtreecommitdiff
path: root/mergetools/kompare
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2019-05-20 08:09:26 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-05-28 10:26:36 -0700
commit97387c8bdd92596d79a84ce8a479c6b3c16d0cb7 (patch)
tree7a026f280c94a43ff9a66986ca49841b0c6937cb /mergetools/kompare
parentam: simplify prompt response handling (diff)
downloadtgif-97387c8bdd92596d79a84ce8a479c6b3c16d0cb7.tar.xz
am: read interactive input from stdin
In the conversion of git-am from shell script to C, we switched to using git_prompt(). Unlike the original shell command "read reply", this doesn't read from stdin at all, but rather from /dev/tty. In most cases this distinction wouldn't matter. We require (as the shell script did) that stdin is a tty, so they would generally be the same thing. But one important exception is our test suite: even with test_terminal, we cannot test "am --interactive" because it insists on reading from /dev/tty, not the pseudo-tty we've set up in the test script. Fixing this clears the way to adding tests in a future patch. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/kompare')
0 files changed, 0 insertions, 0 deletions