The third batch for 1.8.0

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes/1.8.0.txt b/Documentation/RelNotes/1.8.0.txt
index e45788ef3e15e55e2e884adeaa873b9cb8d59942..b626a9a059c79af440f9fefeabbb05eb5d90904e 100644 (file)
--- a/Documentation/RelNotes/1.8.0.txt
+++ b/Documentation/RelNotes/1.8.0.txt
@@ -24,6 +24,13 @@ UI, Workflows & Features
  * A credential helper for Win32 to allow access to the keychain of
    the logged-in user has been added.
 
  * A credential helper for Win32 to allow access to the keychain of
    the logged-in user has been added.
 

+ * "git cherry-pick" learned the "--allow-empty-message" option to
+   allow it to replay a commit without any log message.
+
+ * "git daemon" learned the "--access-hook" option to allow an
+   external command to decline service based on the client address,
+   repository path, etc.
+

  * "git difftool --dir-diff" learned to use symbolic links to prepare
    temporary copy of the working tree when available.
 
  * "git difftool --dir-diff" learned to use symbolic links to prepare
    temporary copy of the working tree when available.
 


@@ -43,6 +50,13 @@ Performance, Internal Implementation, etc. (please report possible regressions)
    for materials meant to be examples that are better typeset in
    monospace.
 
    for materials meant to be examples that are better typeset in
    monospace.
 

+ * Compatibility wrapper to learn the maximum number of file
+   descriptors we can open around sysconf(_SC_OPEN_MAX) and
+   getrlimit(RLIMIT_NO_FILE) has been introduced for portability.
+
+ * Compatibility wrapper around some mkdir(2) implementations that
+   reject parameter with trailing slash has been introduced.
+

 Also contains minor documentation updates and code clean-ups.
 
 
 Also contains minor documentation updates and code clean-ups.
 
 


@@ -53,6 +67,37 @@ Unless otherwise noted, all the fixes since v1.7.12 in the
 maintenance track are contained in this release (see release notes
 to them for details).
 
 maintenance track are contained in this release (see release notes
 to them for details).
 

+ * The exit status code from "git config" was way overspecified while
+   being incorrect.  The implementation has been updated to give the
+   documented status for a case that was documented, and introduce a
+   new code for "all other errors".
+   (merge 9409c7a jc/maint-config-exit-status later to maint).
+
+ * "git foo" errored out with "Not a directory" when the user had a
+   non-directory on $PATH, and worse yet it masked an alias "foo" from
+   running.  (merge a785508 jc/maint-sane-execvp-notdir later to
+   maint).
+
+ * The interactive prompt "git send-email" gives was error prone. It
+   asked "What e-mail address do you want to use?" with the address it
+   guessed (correctly) the user would want to use in its prompt,
+   tempting the user to say "y". But the response was taken as "No,
+   please use 'y' as the e-mail address instead", which is most
+   certainly not what the user meant.
+   (merge 51bbccf jc/send-email-reconfirm later to maint).
+
+ * "git stash apply/pop" did not trigger "rerere" upon conflicts
+   unlike other mergy operations.
+   (merge 743bf6d ph/stash-rerere later to maint).
+
+ * "git submodule update -f" did not update paths in the working tree
+   that has local changes.
+   (merge 01d4721 sz/submodule-force-update later to maint).
+
+ * We used curl_easy_strerror() without checking version of cURL,
+   breaking the build for versions before curl 7.12.0.
+   (merge 4246b0b js/no-curl-easy-strerror-on-old-curl later to maint).
+

  * Code to work around MacOS X UTF-8 gotcha has been cleaned up.
    (merge 9a27f96 rr/precompose-utf8-cleanup later to maint).
 
  * Code to work around MacOS X UTF-8 gotcha has been cleaned up.
    (merge 9a27f96 rr/precompose-utf8-cleanup later to maint).