From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 3 Jun 2009 07:50:05 +0000 (-0700)
Subject: Merge branch 'da/pretty-tempname'
X-Git-Tag: v1.6.4-rc0~87
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b11cf09043f18b368ec0d988f064ea21247c843d;p=git.git

Merge branch 'da/pretty-tempname'

* da/pretty-tempname:
  diff: generate pretty filenames in prep_temp_blob()
  compat: add a basename() compatibility function
  compat: add a mkstemps() compatibility function

Conflicts:
	Makefile
---

b11cf09043f18b368ec0d988f064ea21247c843d
diff --cc Makefile
index 0ab1cff30,a59f10687..06c39e449
--- a/Makefile
+++ b/Makefile
@@@ -702,9 -710,8 +710,10 @@@ ifeq ($(uname_S),SunOS
  	NO_MEMMEM = YesPlease
  	NO_HSTRERROR = YesPlease
  	NO_MKDTEMP = YesPlease
+ 	NO_MKSTEMPS = YesPlease
 -	OLD_ICONV = UnfortunatelyYes
 +	ifneq ($(uname_R),5.11)
 +		OLD_ICONV = UnfortunatelyYes
 +	endif
  	ifeq ($(uname_R),5.8)
  		NO_UNSETENV = YesPlease
  		NO_SETENV = YesPlease