From 256c3fe6c71bfe5899dec7bc4b49fe148b4d3884 Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sun, 18 Feb 2007 10:36:22 +0100 Subject: [PATCH 1/3] Read the config in rev-list Otherwise "git rev-list --header HEAD" will not do the right thing if i18n.commitencoding is set. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- builtin-rev-list.c | 1 + 1 file changed, 1 insertion(+) diff --git a/builtin-rev-list.c b/builtin-rev-list.c index 1bb3a06680..c2db5a5b03 100644 --- a/builtin-rev-list.c +++ b/builtin-rev-list.c @@ -226,6 +226,7 @@ int cmd_rev_list(int argc, const char **argv, const char *prefix) int i; int read_from_stdin = 0; + git_config(git_default_config); init_revisions(&revs, prefix); revs.abbrev = 0; revs.commit_format = CMIT_FMT_UNSPECIFIED; From 38eb9329babb49e5bed52f4e2a577ac01c8d2fcb Mon Sep 17 00:00:00 2001 From: Fredrik Kuivinen Date: Sun, 18 Feb 2007 10:36:51 +0100 Subject: [PATCH 2/3] Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding Similarly for i18n.logoutputencoding. Signed-off-by: Fredrik Kuivinen Signed-off-by: Junio C Hamano --- Documentation/i18n.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt index b4cbb3830e..b95f99be6c 100644 --- a/Documentation/i18n.txt +++ b/Documentation/i18n.txt @@ -25,15 +25,15 @@ mind. an warning if the commit log message given to it does not look like a valid UTF-8 string, unless you explicitly say your project uses a legacy encoding. The way to say this is to - have core.commitencoding in `.git/config` file, like this: + have i18n.commitencoding in `.git/config` file, like this: + ------------ -[core] +[i18n] commitencoding = ISO-8859-1 ------------ + Commit objects created with the above setting record the value -of `core.commitencoding` in its `encoding` header. This is to +of `i18n.commitencoding` in its `encoding` header. This is to help other people who look at them later. Lack of this header implies that the commit log message is encoded in UTF-8. @@ -41,15 +41,15 @@ implies that the commit log message is encoded in UTF-8. header of a commit object, and tries to re-code the log message into UTF-8 unless otherwise specified. You can specify the desired output encoding with - `core.logoutputencoding` in `.git/config` file, like this: + `i18n.logoutputencoding` in `.git/config` file, like this: + ------------ -[core] +[i18n] logoutputencoding = ISO-8859-1 ------------ + If you do not have this configuration variable, the value of -`core.commitencoding` is used instead. +`i18n.commitencoding` is used instead. Note that we deliberately chose not to re-code the commit log message when a commit is made to force UTF-8 at the commit From 4bc94d289221e16cccbc72f73b3b5b1de0b822c5 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 18 Feb 2007 16:18:43 -0800 Subject: [PATCH 3/3] GIT 1.5.0.1 Signed-off-by: Junio C Hamano --- Documentation/RelNotes-1.5.0.1.txt | 17 +++++++++++------ GIT-VERSION-GEN | 2 +- RelNotes | 2 +- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/Documentation/RelNotes-1.5.0.1.txt b/Documentation/RelNotes-1.5.0.1.txt index 5dff2a212d..fea3f9935b 100644 --- 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 6abde8d7b3..9133a00b23 100755 --- 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 4571d0d1cf..63941cdfa9 120000 --- 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