Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* maint:
  GIT 1.5.0.1
  Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
  Read the config in rev-list

Conflicts:

	RelNotes
  • Loading branch information
Junio C Hamano committed Feb 19, 2007
2 parents b758120 + 4bc94d2 commit f5a9264
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 12 deletions.
17 changes: 11 additions & 6 deletions Documentation/RelNotes-1.5.0.1.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,28 @@ 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.

- segfault from git-blame when the mandatory pathname
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
12 changes: 6 additions & 6 deletions Documentation/i18n.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,31 +25,31 @@ 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.

. `git-log`, `git-show` and friends looks at the `encoding`
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
Expand Down
1 change: 1 addition & 0 deletions builtin-rev-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f5a9264

Please sign in to comment.