diff options
| -rw-r--r-- | Documentation/RelNotes-1.5.0.1.txt | 17 | ||||
| -rw-r--r-- | Documentation/i18n.txt | 12 | ||||
| -rw-r--r-- | builtin-rev-list.c | 1 |
3 files changed, 18 insertions, 12 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/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 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; |