diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:11 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-08-24 12:05:11 -0700 |
| commit | 3f988231ae438e2fc98c94f870a9b266f93e1955 (patch) | |
| tree | 3cb4bd283b76a32c247043179252a2529f5b9910 | |
| parent | Merge branch 'jk/maint-commit-check-committer-early' into maint-1.7.11 (diff) | |
| parent | Enable HAVE_DEV_TTY for Solaris (diff) | |
| download | git-3f988231ae438e2fc98c94f870a9b266f93e1955.tar.gz git-3f988231ae438e2fc98c94f870a9b266f93e1955.zip | |
Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11
* bw/maint-1.7.9-solaris-getpass:
Enable HAVE_DEV_TTY for Solaris
terminal: seek when switching between reading and writing
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | compat/terminal.c | 1 |
2 files changed, 2 insertions, 0 deletions
@@ -1005,6 +1005,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 6d16c8fba0..bbb038dd01 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); } |