From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Aug 2012 22:14:57 +0000 (-0700)
Subject: Merge branch 'bw/maint-1.7.9-solaris-getpass'
X-Git-Tag: v1.7.12-rc3~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5acacfb48b29e5d2c86d14b988321df086f2228;p=git

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
---

e5acacfb48b29e5d2c86d14b988321df086f2228
diff --cc Makefile
index 15d13197d4,9472ff768c..6b0c961d3a
--- a/Makefile
+++ b/Makefile
@@@ -1013,7 -909,7 +1013,8 @@@ ifeq ($(uname_S),SunOS
  	NO_MKSTEMPS = YesPlease
  	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