git/commit.c, branch v1.5.0-rc3

Use log output encoding in --pretty=email headers.

2007-01-13T18:10:20Z

Private functions add_rfc2047() and pretty_print_commit() assumed they are only emitting UTF-8. Signed-off-by: Junio C Hamano

merge-base: do not leak commit list

2007-01-09T07:10:49Z

Signed-off-by: Junio C Hamano

short i/o: fix calls to write to use xwrite or write_in_full

2007-01-08T23:44:47Z

We have a number of badly checked write() calls. Often we are expecting write() to write exactly the size we requested or fail, this fails to handle interrupts or short writes. Switch to using the new write_in_full(). Otherwise we at a minimum need to check for EINTR and EAGAIN, where this is appropriate use xwrite(). Note, the changes to config handling are much larger and handled in the next patch in the sequence. Signed-off-by: Andy Whitcroft Signed-off-by: Junio C Hamano

Skip excessive blank lines before commit body

2007-01-03T16:29:01Z

This modifies pretty_print_commit() to make the output of git-rev-list and friends a bit more predictable. A commit body starting with blank lines might be unheard-of, but still possible to create using git-commit-tree (so is bound to appear somewhere, sometime). Signed-off-by: Lars Hjemli Signed-off-by: Junio C Hamano

i18n: do not leak 'encoding' header even when we cheat the conversion.

2007-01-01T02:55:28Z

We special case the case where encoding recorded in the commit and the output encoding are the same and do not call iconv(). But we should drop 'encoding' header for this case as well for consistency. Signed-off-by: Junio C Hamano

i18n: drop "encoding" header in the output after re-coding.

2006-12-31T00:35:57Z

After re-coding the commit message into the encoding the user specified (either with core.logoutputencidng or --encoding option), this drops the "encoding" header altogether. The output is after re-coding as the user asked (either with the config or --encoding= option), and the extra header becomes redundant information. Signed-off-by: Junio C Hamano

commit re-encoding: fix confusion between no and default conversion.

2006-12-30T10:18:24Z

Telling the git-log family not to do any character conversion is done with --encoding=none, which sets log_output_encoding to an empty string. However, logmsg_reencode() confused this with log_output_encoding and commit_encoding set to NULL. The latter means we should use the default encoding (i.e. utf-8). Signed-off-by: Junio C Hamano

Merge branch 'jc/utf8'

2006-12-29T03:03:02Z

* jc/utf8: t3900: test conversion to non UTF-8 as well Rename t3900 test vector file UTF-8: introduce i18n.logoutputencoding. Teach log family --encoding i18n.logToUTF8: convert commit log message to UTF-8 Move encoding conversion routine out of mailinfo to utf8.c Conflicts: commit.c

UTF-8: introduce i18n.logoutputencoding.

2006-12-28T00:41:33Z

It is plausible for somebody to want to view the commit log in a different encoding from i18n.commitencoding -- the project's policy may be UTF-8 and the user may be using a commit message hook to run iconv to conform to that policy (and either not have i18n.commitencoding to default to UTF-8 or have it explicitly set to UTF-8). Even then, Latin-1 may be more convenient for the usual pager and the terminal the user uses. The new variable i18n.logoutputencoding is used in preference to i18n.commitencoding to decide what encoding to recode the log output in when git-log and friends formats the commit log message. Signed-off-by: Junio C Hamano

Merge branch 'master' into js/shallow

2006-12-27T10:43:46Z

This is to adjust to: count-objects -v: show number of packs as well. which will break a test in this series. Signed-off-by: Junio C Hamano