diff options
| -rw-r--r-- | Documentation/Makefile | 7 | ||||
| -rw-r--r-- | Documentation/RelNotes-1.6.5.5.txt | 44 | ||||
| -rwxr-xr-x | t/t4201-shortlog.sh | 4 |
3 files changed, 53 insertions, 2 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index e841ca96cb..3f1042eebb 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -109,7 +109,14 @@ endif # use MAN_BASE_URL=http://www.kernel.org/pub/software/scm/git/docs/ # but distros may want to set it to /usr/share/doc/git-core/docs/ or # something like that. +# +# As older stylesheets simply ignore this parameter, it ought to be +# safe to set it to empty string when the base URL is not specified, +# but unfortunately we cannot do so unconditionally because at least +# xmlto 0.0.18 is reported to lack --stringparam option. +ifdef MAN_BASE_URL XMLTO_EXTRA += --stringparam man.base.url.for.relative.links=$(MAN_BASE_URL) +endif # If your target system uses GNU groff, it may try to render # apostrophes as a "pretty" apostrophe using unicode. This breaks diff --git a/Documentation/RelNotes-1.6.5.5.txt b/Documentation/RelNotes-1.6.5.5.txt new file mode 100644 index 0000000000..616e0dd0fd --- /dev/null +++ b/Documentation/RelNotes-1.6.5.5.txt @@ -0,0 +1,44 @@ +Git v1.6.5.5 Release Notes +========================== + +Fixes since v1.6.5.4 +-------------------- + + * Manual pages can be formatted with older xmlto again. + + * GREP_OPTIONS exported from user's environment could have broken + our scripted commands. + + * In configuration files, a few variables that name paths can begin with + ~/ and ~username/ and they are expanded as expected. This is not a + bugfix but 1.6.6 will have this and without backporting users cannot + easily use the same ~/.gitconfig across versions. + + * "git diff -B -M" did the same computation to hash lines of contents + twice, and held onto memory after it has used the data in it + unnecessarily before it freed. + + * "git format-patch revisions... -- path" issued an incorrect error + message that suggested to use "--" on the command line when path + does not exist in the current work tree (it is a separate matter if + it makes sense to limit format-patch with pathspecs like that + without using the --full-diff option). + + * "git grep -F -i StRiNg" did not work as expected. + + * Enumeration of available merge strategies iterated over the list of + commands in a wrong way, sometimes producing an incorrect result. + + * "git shortlog" did not honor the "encoding" header embedded in the + commit object like "git log" did. + + * Reading progress messages that come from the remote side while running + "git pull" is given precedence over reading the actual pack data to + prevent garbled progress message on the user's terminal. + + * "git rebase" got confused when the log message began with certain + strings that looked like Subject:, Date: or From: header. + +Other minor documentation updates are included. + +v1.6.5.4-47-gdda8f4b diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh index dd818f6fd6..a01e55bf6b 100755 --- a/t/t4201-shortlog.sh +++ b/t/t4201-shortlog.sh @@ -53,7 +53,7 @@ GIT_DIR=non-existing git shortlog -w < log > out test_expect_success 'shortlog from non-git directory' 'test_cmp expect out' iconvfromutf8toiso88591() { - printf "%s" "$*" | iconv -f UTF-8 -t ISO-8859-1 + printf "%s" "$*" | iconv -f UTF-8 -t ISO8859-1 } DSCHO="Jöhännës \"Dschö\" Schindëlin" @@ -72,7 +72,7 @@ test_expect_success 'shortlog encoding' ' git config --unset i18n.commitencoding && echo 2 > a1 && git commit --quiet -m "$MSG1" --author="$DSCHOE" a1 && - git config i18n.commitencoding "ISO-8859-1" && + git config i18n.commitencoding "ISO8859-1" && echo 3 > a1 && git commit --quiet -m "$(iconvfromutf8toiso88591 "$MSG2")" \ --author="$(iconvfromutf8toiso88591 "$DSCHOE")" a1 && |