From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 4 Sep 2013 19:32:11 +0000 (-0700)
Subject: Merge branch 'tr/fd-gotcha-fixes'
X-Git-Tag: v1.8.5-rc0~190
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/de5412bc13cd4e3b86f2e4dba7d2cced18d524b4?ds=inline;hp=-c

Merge branch 'tr/fd-gotcha-fixes'

Finishing touches to an earlier fix already in 'master'.

* tr/fd-gotcha-fixes:
t0070: test that git_mkstemps correctly checks return value of open()
---

de5412bc13cd4e3b86f2e4dba7d2cced18d524b4
diff --combined t/t0070-fundamental.sh
index 986b2a8f26,ff3776fcb8..5ed69a6f56
--- a/t/t0070-fundamental.sh
+++ b/t/t0070-fundamental.sh
@@@ -17,7 -17,7 +17,7 @@@ test_expect_success 'mktemp to nonexist
  	grep "doesnotexist/test" err
  '
  
 -test_expect_success POSIXPERM 'mktemp to unwritable directory prints filename' '
 +test_expect_success POSIXPERM,SANITY 'mktemp to unwritable directory prints filename' '
  	mkdir cannotwrite &&
  	chmod -w cannotwrite &&
  	test_when_finished "chmod +w cannotwrite" &&
@@@ -25,6 -25,10 +25,10 @@@
  	grep "cannotwrite/test" err
  '
  
+ test_expect_success 'git_mkstemps_mode does not fail if fd 0 is not open' '
+ 	git commit --allow-empty -m message <&-
+ '
+ 
  test_expect_success 'check for a bug in the regex routines' '
  	# if this test fails, re-build git with NO_REGEX=1
  	test-regex