diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-03-28 15:39:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-03-28 15:39:57 -0700 |
| commit | 0a98f9d13802880a68ce6564b9f47b1c3e3341c7 (patch) | |
| tree | 1465fa12fd8127c4c76405f0fc3d1c44583365d4 | |
| parent | 03bcaacaadbb325f412e6dffec27fea6acb9321e (diff) | |
| parent | 9529a2524a29c15107905f2f8f0b310a40880dc7 (diff) | |
| download | git-0a98f9d13802880a68ce6564b9f47b1c3e3341c7.tar.gz git-0a98f9d13802880a68ce6564b9f47b1c3e3341c7.tar.xz | |
Merge branch 'maint' to synchronize with 1.5.0.6
| -rw-r--r-- | Documentation/RelNotes-1.5.0.6.txt | 22 | ||||
| -rw-r--r-- | commit.c | 7 | ||||
| -rwxr-xr-x | git-commit.sh | 2 |
3 files changed, 28 insertions, 3 deletions
diff --git a/Documentation/RelNotes-1.5.0.6.txt b/Documentation/RelNotes-1.5.0.6.txt new file mode 100644 index 000000000..e15447ffd --- /dev/null +++ b/Documentation/RelNotes-1.5.0.6.txt @@ -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. + @@ -654,6 +654,7 @@ static char *get_header(const struct commit *commit, const char *key) 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; @@ -661,8 +662,10 @@ static char *replace_encoding_header(char *buf, const char *encoding) 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 3656d607d..292cf967e 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -371,7 +371,7 @@ t,) 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 |