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

diff --cc Makefile
index bde27ed478c29a9e5866219eec09a76c828b7ce7,f88ed3e14d2421fdd730705d2aac0c317d6f94e0..daf4296706c4c9c524b6ec4434cadcf95881ea25
--- 1/Makefile
--- 2/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

diff --cc builtin-branch.c
Simple merge

diff --cc builtin-fast-export.c
Simple merge

diff --cc refs.c
Simple merge