From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 24 Jul 2009 16:27:09 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.4-rc3~11
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f87dd2152a6941dfa7f3ddaf599bc30f58562a98;p=git.git

Merge branch 'maint'

* maint:
  SunOS grep does not understand -C<n> nor -e
  Fix export_marks() error handling.
  git branch: clean up detached branch handling
  git branch: avoid unnecessary object lookups
  git branch: fix performance problem
  do_one_ref(): null_sha1 check is not about broken ref

Conflicts:
	Makefile
---

f87dd2152a6941dfa7f3ddaf599bc30f58562a98
diff --cc Makefile
index bde27ed47,f88ed3e14..daf429670
--- a/Makefile
+++ b/Makefile
@@@ -722,22 -697,12 +722,23 @@@ ifeq ($(uname_S),SunOS
  	NEEDS_SOCKET = YesPlease
  	NEEDS_NSL = YesPlease
  	SHELL_PATH = /bin/bash
 +	SANE_TOOL_PATH = /usr/xpg6/bin:/usr/xpg4/bin
  	NO_STRCASESTR = YesPlease
  	NO_MEMMEM = YesPlease
 -	NO_HSTRERROR = YesPlease
  	NO_MKDTEMP = YesPlease
 -	OLD_ICONV = UnfortunatelyYes
 +	NO_MKSTEMPS = YesPlease
 +	NO_REGEX = YesPlease
+ 	NO_EXTERNAL_GREP = YesPlease
 +	ifeq ($(uname_R),5.7)
 +		NEEDS_RESOLV = YesPlease
 +		NO_IPV6 = YesPlease
 +		NO_SOCKADDR_STORAGE = YesPlease
 +		NO_UNSETENV = YesPlease
 +		NO_SETENV = YesPlease
 +		NO_STRLCPY = YesPlease
 +		NO_C99_FORMAT = YesPlease
 +		NO_STRTOUMAX = YesPlease
 +	endif
  	ifeq ($(uname_R),5.8)
  		NO_UNSETENV = YesPlease
  		NO_SETENV = YesPlease