Skip to content

Commit 9236315

Browse files
dschoGit for Windows Build Agent
authored andcommitted
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
To support Git Bash running in a MinTTY, we use a dirty trick to access the MSYS2 pseudo terminal: we execute a Bash snippet that accesses /dev/tty. The idea was to fall back to writing to/reading from CONOUT$/CONIN$ if that Bash call failed because Bash was not found. However, we should fall back even in other error conditions, because we have not successfully read the user input. Let's make it so. Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1733b7c commit 9236315

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

compat/terminal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
258258

259259
/* try shell_prompt first, fall back to CONIN/OUT if bash is missing */
260260
char *result = shell_prompt(prompt, echo);
261-
if (result || errno != ENOENT)
261+
if (result)
262262
return result;
263263

264264
#endif

0 commit comments

Comments
 (0)