From d3e41ebff44745055001e59e460509a8f04b81a2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Mar 2007 03:05:08 -0700 Subject: git-commit: "read-tree -m HEAD" is not the right way to read-tree quickly It still looks at the working tree and checks for locally modified paths. When are preparing a temporary index from HEAD, we do not want any of that. Signed-off-by: Junio C Hamano --- git-commit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-commit.sh b/git-commit.sh index cad16a5e86..fdaedc0e2e 100755 --- a/git-commit.sh +++ b/git-commit.sh @@ -360,7 +360,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 -- cgit v1.2.3 From 75c962c99a9115d489549ad9b8419d3e37e85f02 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 22 Mar 2007 21:05:28 -0400 Subject: t4118: be nice to non-GNU sed Elias Pipping: > I'm on a mac, hence /usr/bin/sed is not gnu sed, which makes > t4118 fail. Signed-off-by: Johannes Schindelin Ack'd-by: Elias Pipping Signed-off-by: Junio C Hamano --- t/t4118-apply-empty-context.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/t/t4118-apply-empty-context.sh b/t/t4118-apply-empty-context.sh index 7309422fe5..e78b1a1a79 100755 --- a/t/t4118-apply-empty-context.sh +++ b/t/t4118-apply-empty-context.sh @@ -23,7 +23,8 @@ test_expect_success setup ' cat file2 >file2.orig git add file1 file2 && sed -e "/^B/d" file1 && - sed -e "/^B/d" file2 && + sed -e "/^[BQ]/d" file2 && + echo Q | tr -d "\\012" >>file2 && cat file1 >file1.mods && cat file2 >file2.mods && git diff | -- cgit v1.2.3 From d0e50cb4cb8e0cc8b445a9749547019efaa5703e Mon Sep 17 00:00:00 2001 From: Jeff King Date: Wed, 28 Mar 2007 17:52:09 -0400 Subject: commit: fix pretty-printing of messages with "\nencoding " The function replace_encoding_header is given the whole commit buffer, including the commit message. When looking for the encoding header, if none was found in the header, it would locate any line in the commit message matching "\nencoding " and remove it. Instead, we now make sure to search only to the end of the header. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- commit.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/commit.c b/commit.c index 3e8c87294b..1fe23b6e3a 100644 --- a/commit.c +++ b/commit.c @@ -644,6 +644,7 @@ static char *get_header(const struct commit *commit, const char *key) static char *replace_encoding_header(char *buf, 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; @@ -651,8 +652,10 @@ static char *replace_encoding_header(char *buf, 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) -- cgit v1.2.3 From 9529a2524a29c15107905f2f8f0b310a40880dc7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 28 Mar 2007 13:53:00 -0700 Subject: GIT 1.5.0.6 --- Documentation/RelNotes-1.5.0.6.txt | 22 ++++++++++++++++++++++ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Documentation/RelNotes-1.5.0.6.txt diff --git a/Documentation/RelNotes-1.5.0.6.txt b/Documentation/RelNotes-1.5.0.6.txt new file mode 100644 index 0000000000..e15447ffdb --- /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. + diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index 3f41a87bed..6abd4cfc98 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.5.0.5.GIT +DEF_VER=v1.5.0.6.GIT LF=' ' diff --git a/RelNotes b/RelNotes index 8877578a8a..4e145f3021 120000 --- a/RelNotes +++ b/RelNotes @@ -1 +1 @@ -Documentation/RelNotes-1.5.0.5.txt \ No newline at end of file +Documentation/RelNotes-1.5.0.6.txt \ No newline at end of file -- cgit v1.2.3