From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 10 Feb 2011 00:41:16 +0000 (-0800)
Subject: Merge branch 'ae/better-template-failure-report'
X-Git-Tag: v1.7.5-rc0~146
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/70ec8687a66eb7d3b273d9a7996fab309d2b0974?ds=inline;hp=-c

Merge branch 'ae/better-template-failure-report'

* ae/better-template-failure-report:
Improve error messages when temporary file creation fails
---

70ec8687a66eb7d3b273d9a7996fab309d2b0974
diff --combined Makefile
index 775ee838c3,03a51cb8f2..ade79232f4
--- a/Makefile
+++ b/Makefile
@@@ -431,10 -431,10 +431,11 @@@ TEST_PROGRAMS_NEED_X += test-run-comman
  TEST_PROGRAMS_NEED_X += test-sha1
  TEST_PROGRAMS_NEED_X += test-sigchain
  TEST_PROGRAMS_NEED_X += test-string-pool
 +TEST_PROGRAMS_NEED_X += test-subprocess
  TEST_PROGRAMS_NEED_X += test-svn-fe
  TEST_PROGRAMS_NEED_X += test-treap
  TEST_PROGRAMS_NEED_X += test-index-version
+ TEST_PROGRAMS_NEED_X += test-mktemp
  
  TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
  
@@@ -1004,7 -1004,6 +1005,7 @@@ ifeq ($(uname_S),IRIX
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 +	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH = /usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease
@@@ -1024,7 -1023,6 +1025,7 @@@ ifeq ($(uname_S),IRIX64
  	# issue, comment out the NO_MMAP statement.
  	NO_MMAP = YesPlease
  	NO_REGEX = YesPlease
 +	NO_FNMATCH_CASEFOLD = YesPlease
  	SNPRINTF_RETURNS_BOGUS = YesPlease
  	SHELL_PATH=/usr/gnu/bin/bash
  	NEEDS_LIBGEN = YesPlease