summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <junkio@cox.net>2007-04-11 14:39:07 -0700
committerLibravatar Junio C Hamano <junkio@cox.net>2007-04-11 17:19:36 -0700
commit9b11d24d4156e0b2246383faad16eb8aa0caeefb (patch)
tree08c1fc6087bb11e5e394d0fc4870e81cba07c169
parentcvsserver: Fix handling of diappeared files on update (diff)
downloadtgif-9b11d24d4156e0b2246383faad16eb8aa0caeefb.tar.xz
GIT 1.5.1.1
Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/RelNotes-1.5.1.1.txt29
-rwxr-xr-xGIT-VERSION-GEN2
2 files changed, 23 insertions, 8 deletions
diff --git a/Documentation/RelNotes-1.5.1.1.txt b/Documentation/RelNotes-1.5.1.1.txt
index b48b4bc3e8..3054b5a3f0 100644
--- a/Documentation/RelNotes-1.5.1.1.txt
+++ b/Documentation/RelNotes-1.5.1.1.txt
@@ -1,4 +1,4 @@
-GIT v1.5.1.1 Release Notes (draft)
+GIT v1.5.1.1 Release Notes
==========================
Fixes since v1.5.1
@@ -10,8 +10,23 @@ Fixes since v1.5.1
- The documentation for cvsimport has been majorly improved.
+ - "git-show-ref --exclude-existing" was documented.
+
* Bugfixes
+ - The implementation of -p option in "git cvsexportcommit" had
+ the meaning of -C (context reduction) option wrong, and
+ loosened the context requirements when it was told to be
+ strict.
+
+ - "git cvsserver" did not behave like the real cvsserver when
+ client side removed a file from the working tree without
+ doing anything else on the path. In such a case, it should
+ restore it from the checked out revision.
+
+ - "git fsck" issued an alarming error message on detached
+ HEAD. It is not an error since at least 1.5.0.
+
- "git send-email" produced of References header of unbounded length;
fixed this with line-folding.
@@ -37,10 +52,10 @@ Fixes since v1.5.1
- gitweb did not show type-changing patch correctly in the
blobdiff view.
-* Performance Tweaks
+ - git-svn did not error out with incorrect command line options.
+
+ - git-svn fell into an infinite loop when insanely long commit
+ message was found.
---
-exec >/var/tmp/1
-O=v1.5.1-26-ge94a4f6
-echo O=`git describe refs/heads/maint`
-git shortlog --no-merges $O..refs/heads/maint
+ - git-svn dcommit and rebase was confused by patches that were
+ merged from another branch that is managed by git-svn.
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 48715012be..2325660ff4 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.1.GIT
+DEF_VER=v1.5.1.1.GIT
LF='
'