author | Junio C Hamano <junkio@cox.net> | |
Wed, 28 Mar 2007 22:39:57 +0000 (15:39 -0700) | ||
committer | Junio C Hamano <junkio@cox.net> | |
Wed, 28 Mar 2007 22:39:57 +0000 (15:39 -0700) |
Documentation/RelNotes-1.5.0.6.txt | [new file with mode: 0644] | patch | blob |
commit.c | patch | blob | history | |
git-commit.sh | patch | blob | history |
diff --git a/Documentation/RelNotes-1.5.0.6.txt b/Documentation/RelNotes-1.5.0.6.txt
--- /dev/null
@@ -0,0 +1,22 @@
+GIT v1.5.0.6 Release Notes
+==========================
+
+Fixes since v1.5.0.5
+--------------------
+
+* Bugfixes
+
+ - a handful small fixes to gitweb.
+
+ - build procedure for user-manual is fixed not to require locally
+ installed stylesheets.
+
+ - "git commit $paths" on paths whose earlier contents were
+ already updated in the index were failing out.
+
+* Documentation
+
+ - user-manual has better cross references.
+
+ - gitweb installation/deployment procedure is now documented.
+
diff --git a/commit.c b/commit.c
index a4f2e74c0b9b17a467fd9c4d3f5a2d275d5ea038..754d1b8a0b8282fd3d1d6bd8f6ccb21b407504a5 100644 (file)
--- a/commit.c
+++ b/commit.c
static char *replace_encoding_header(char *buf, const char *encoding)
{
char *encoding_header = strstr(buf, "\nencoding ");
+ char *header_end = strstr(buf, "\n\n");
char *end_of_encoding_header;
int encoding_header_pos;
int encoding_header_len;
int need_len;
int buflen = strlen(buf) + 1;
- if (!encoding_header)
- return buf; /* should not happen but be defensive */
+ if (!header_end)
+ header_end = buf + buflen;
+ if (!encoding_header || encoding_header >= header_end)
+ return buf;
encoding_header++;
end_of_encoding_header = strchr(encoding_header, '\n');
if (!end_of_encoding_header)
diff --git a/git-commit.sh b/git-commit.sh
index 3656d607d5b91d8d125b5a72b6a2a00aee512618..292cf967e3cbc77e7b49eb7252a756194e917418 100755 (executable)
--- a/git-commit.sh
+++ b/git-commit.sh
if test -z "$initial_commit"
then
cp "$THIS_INDEX" "$TMP_INDEX"
- GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -m HEAD
+ GIT_INDEX_FILE="$TMP_INDEX" git-read-tree -i -m HEAD
else
rm -f "$TMP_INDEX"
fi || exit