From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 22 Dec 2011 19:27:23 +0000 (-0800)
Subject: Merge branch 'jk/git-prompt'
X-Git-Tag: v1.7.9-rc0~31
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ded408fd20e2fedb76850c9fa9bbaa26b888aa7c;p=git.git

Merge branch 'jk/git-prompt'

* jk/git-prompt:
  contrib: add credential helper for OS X Keychain
  Makefile: OS X has /dev/tty
  Makefile: linux has /dev/tty
  credential: use git_prompt instead of git_getpass
  prompt: use git_terminal_prompt
  add generic terminal prompt function
  refactor git_getpass into generic prompt function
  move git_getpass to its own source file
  imap-send: don't check return value of git_getpass
  imap-send: avoid buffer overflow

Conflicts:
	Makefile
---

ded408fd20e2fedb76850c9fa9bbaa26b888aa7c
diff --cc Makefile
index 9470a1034,4449cc8f7..a78240930
--- a/Makefile
+++ b/Makefile
@@@ -855,7 -837,7 +862,8 @@@ ifeq ($(uname_S),Linux
  	NO_STRLCPY = YesPlease
  	NO_MKSTEMPS = YesPlease
  	HAVE_PATHS_H = YesPlease
 +	LIBC_CONTAINS_LIBINTL = YesPlease
+ 	HAVE_DEV_TTY = YesPlease
  endif
  ifeq ($(uname_S),GNU/kFreeBSD)
  	NO_STRLCPY = YesPlease
@@@ -1681,10 -1653,10 +1690,14 @@@ ifdef HAVE_PATHS_
  	BASIC_CFLAGS += -DHAVE_PATHS_H
  endif
  
 +ifdef HAVE_LIBCHARSET_H
 +	BASIC_CFLAGS += -DHAVE_LIBCHARSET_H
 +endif
 +
+ ifdef HAVE_DEV_TTY
+ 	BASIC_CFLAGS += -DHAVE_DEV_TTY
+ endif
+ 
  ifdef DIR_HAS_BSD_GROUP_SEMANTICS
  	COMPAT_CFLAGS += -DDIR_HAS_BSD_GROUP_SEMANTICS
  endif