From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Aug 2012 19:05:11 +0000 (-0700)
Subject: Merge branch 'bw/maint-1.7.9-solaris-getpass' into maint-1.7.11
X-Git-Tag: v1.7.11.6~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f988231ae438e2fc98c94f870a9b266f93e1955;p=git

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

3f988231ae438e2fc98c94f870a9b266f93e1955
diff --cc Makefile
index df583035e4,9472ff768c..1f72c1c745
--- a/Makefile
+++ b/Makefile
@@@ -1004,7 -909,7 +1004,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