Temporarily back out compat/terminal.c changes

The "hack" to use `bash`'s `read -r` function to read reliably from
`/dev/tty` conflicts with the upcoming built-in `add -p`, to support
single key stroke commands.

Let's back out the changes, and then re-apply them on top of `add -p`,
consolidated.

Signed-off-by: Johannes Schindelin <[email protected]>

Author: dscho

compat/terminal.c

@@ -1,12 +1,7 @@
-#ifndef NO_INTTYPES_H
-#include <inttypes.h>
-#endif
 #include "git-compat-util.h"
-#include "run-command.h"
 #include "compat/terminal.h"
 #include "sigchain.h"
 #include "strbuf.h"
-#include "cache.h"
 
 #if defined(HAVE_DEV_TTY) || defined(GIT_WINDOWS_NATIVE)
 
@@ -96,55 +91,6 @@ static int disable_echo(void)
 	return 0;
 }
 
-static char *shell_prompt(const char *prompt, int echo)
-{
-	const char *read_input[] = {
-		/* Note: call 'bash' explicitly, as 'read -s' is bash-specific */
-		"bash", "-c", echo ?
-		"cat >/dev/tty && read -r line </dev/tty && echo \"$line\"" :
-		"cat >/dev/tty && read -r -s line </dev/tty && echo \"$line\" && echo >/dev/tty",
-		NULL
-	};
-	struct child_process child = CHILD_PROCESS_INIT;
-	static struct strbuf buffer = STRBUF_INIT;
-	int prompt_len = strlen(prompt), len = -1, code;
-
-	child.argv = read_input;
-	child.in = -1;
-	child.out = -1;
-	child.silent_exec_failure = 1;
-
-	if (start_command(&child))
-		return NULL;
-
-	if (write_in_full(child.in, prompt, prompt_len) != prompt_len) {
-		error("could not write to prompt script");
-		close(child.in);
-		goto ret;
-	}
-	close(child.in);
-
-	strbuf_reset(&buffer);
-	len = strbuf_read(&buffer, child.out, 1024);
-	if (len < 0) {
-		error("could not read from prompt script");
-		goto ret;
-	}
-
-	strbuf_strip_suffix(&buffer, "\n");
-	strbuf_strip_suffix(&buffer, "\r");
-
-ret:
-	close(child.out);
-	code = finish_command(&child);
-	if (code) {
-		error("failed to execute prompt script (exit code %d)", code);
-		return NULL;
-	}
-
-	return len < 0 ? NULL : buffer.buf;
-}
-
 #endif
 
 #ifndef FORCE_TEXT
@@ -157,15 +103,6 @@ char *git_terminal_prompt(const char *prompt, int echo)
 	int r;
 	FILE *input_fh, *output_fh;
 
-#ifdef GIT_WINDOWS_NATIVE
-
-	/* try shell_prompt first, fall back to CONIN/OUT if bash is missing */
-	char *result = shell_prompt(prompt, echo);
-	if (result)
-		return result;
-
-#endif
-
 	input_fh = fopen(INPUT_PATH, "r" FORCE_TEXT);
 	if (!input_fh)
 		return NULL;