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

diff --cc Makefile
index 0ab1cff30de7b3cc745ce79acca4a3f7cfbd1977,a59f10687bd158757422809ad20022d84ead9b9a..06c39e449d17e8170e2e387caefd51b16ab15e55
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -702,9 -710,8 +710,10 @@@ ifeq ($(uname_S),SunOS
        NO_MEMMEM = YesPlease
        NO_HSTRERROR = YesPlease
        NO_MKDTEMP = YesPlease
 -      OLD_ICONV = UnfortunatelyYes
+       NO_MKSTEMPS = YesPlease
 +      ifneq ($(uname_R),5.11)
 +              OLD_ICONV = UnfortunatelyYes
 +      endif
        ifeq ($(uname_R),5.8)
                NO_UNSETENV = YesPlease
                NO_SETENV = YesPlease

diff --cc git-compat-util.h
Simple merge