GIT 1.5.0.1

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Documentation/RelNotes-1.5.0.1.txt b/Documentation/RelNotes-1.5.0.1.txt
index 5dff2a212d95219778bbdb2875c2241b872ba089..fea3f9935b7794ce86f04d22c9d68fb9d537167d 100644 (file)
--- a/Documentation/RelNotes-1.5.0.1.txt
+++ b/Documentation/RelNotes-1.5.0.1.txt
@@ -15,8 +15,16 @@ Fixes since v1.5.0
   - Converted remaining mentions of update-index on Porcelain
     documents to git-add/git-rm.
 
+  - Some i18n.* configuration variables were incorrectly
+    described as core.*; fixed.
+
 * Bugfixes
 
+  - git-add and git-update-index on a filesystem on which
+    executable bits are unreliable incorrectly reused st_mode
+    bits even when the path changed between symlink and regular
+    file.
+
   - git-daemon marks the listening sockets with FD_CLOEXEC so
     that it won't be leaked into the children.
 
@@ -24,14 +32,11 @@ Fixes since v1.5.0
     parameter was missing was fixed; usage() message is given
     instead.
 
+  - git-rev-list did not read $GIT_DIR/config file, which means
+    that did not honor i18n.logoutputencoding correctly.
+
 * Tweaks
 
   - sliding mmap() inefficiently mmaped the same region of a
     packfile with an access pattern that used objects in the
     reverse order.  This has been made more efficient.
-
---
-exec >/var/tmp/1
-O=v1.5.0-24-g460ca30
-echo O=`git describe maint`
-git shortlog --no-merges $O..maint

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 6abde8d7b36865c0c8f43b4489ce0074a27f24c8..9133a00b230624c8708807e22c9b9615d980b834 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.0.GIT
+DEF_VER=v1.5.0.1.GIT
 
 LF='
 '

diff --git a/RelNotes b/RelNotes
index 4571d0d1cfb5a4170dfc80e9654228acae295129..63941cdfa9b8c7b3c4e693085a53928f863959db 120000 (symlink)
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.0.txt
\ No newline at end of file
+Documentation/RelNotes-1.5.0.1.txt
\ No newline at end of file