summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-08 22:14:57 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-08 22:14:58 (GMT)
commite5acacfb48b29e5d2c86d14b988321df086f2228 (patch)
tree837e4dd4bd0330942a788df1840ad5ee3975cf66
parentfa0aad4ff5079132e0a163daa701506d652b2bf8 (diff)
parent436783c95a59cca00a7cca1219666bb0af67cb81 (diff)
downloadgit-e5acacfb48b29e5d2c86d14b988321df086f2228.zip
git-e5acacfb48b29e5d2c86d14b988321df086f2228.tar.gz
git-e5acacfb48b29e5d2c86d14b988321df086f2228.tar.bz2
Merge branch 'bw/maint-1.7.9-solaris-getpass'
The recent update to terminal I/O interface to get passwords &c interactively didn't quite work on Solaris. * bw/maint-1.7.9-solaris-getpass: Enable HAVE_DEV_TTY for Solaris terminal: seek when switching between reading and writing
-rw-r--r--Makefile1
-rw-r--r--compat/terminal.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 15d1319..6b0c961 100644
--- a/Makefile
+++ b/Makefile
@@ -1014,6 +1014,7 @@ ifeq ($(uname_S),SunOS)
NO_REGEX = YesPlease
NO_FNMATCH_CASEFOLD = YesPlease
NO_MSGFMT_EXTENDED_OPTIONS = YesPlease
+ HAVE_DEV_TTY = YesPlease
ifeq ($(uname_R),5.6)
SOCKLEN_T = int
NO_HSTRERROR = YesPlease
diff --git a/compat/terminal.c b/compat/terminal.c
index 6d16c8f..bbb038d 100644
--- a/compat/terminal.c
+++ b/compat/terminal.c
@@ -59,6 +59,7 @@ char *git_terminal_prompt(const char *prompt, int echo)
r = strbuf_getline(&buf, fh, '\n');
if (!echo) {
+ fseek(fh, SEEK_CUR, 0);
putc('\n', fh);
fflush(fh);
}