Merge branch 'jk/prompt-fallback-to-tty'
commit974e978b09fdabba009c18f99db54cc36baf9c36
authorJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:34 +0000 (12 22:43 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 13 Feb 2012 06:43:34 +0000 (12 22:43 -0800)
treeb8f8dc69549598b91fe14a09dfeae6f70467d416
parentd1168b903320fc7c2c422ed08f881379e0bd8f35
parent84d72733fc8cb90ac7fef04bb114da1e14d8b147
Merge branch 'jk/prompt-fallback-to-tty'

* jk/prompt-fallback-to-tty:
  prompt: fall back to terminal if askpass fails
  prompt: clean up strbuf usage