[ANNOUNCE] GIT 1.5.4.5
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Mar 28, 2008, 06:26 UTC
- Message-ID
- <7vtzir2wke.fsf@gitster.siamese.dyndns.org>
The latest maintenance release GIT 1.5.4.5 is available at the usual places:
http://www.kernel.org/pub/software/scm/git/
git-1.5.4.5.tar.{gz,bz2} (tarball)
git-htmldocs-1.5.4.5.tar.{gz,bz2} (preformatted docs)
git-manpages-1.5.4.5.tar.{gz,bz2} (preformatted docs)
RPMS/$arch/git-*-1.5.4.5-1.$arch.rpm (RPM)Among many fixes, a notable one is a regression we introduced in 1.5.4 that changed the behaviour of "git fetch there" when you have the URL information for "there" in .git/branches/there. Such a fetch should have updated your local branch "there", but 1.5.4 and later didn't. This should fix the breakage.
----------------------------------------------------------------
GIT v1.5.4.5 Release Notes ==========================
Fixes since v1.5.4.4 --------------------
* "git fetch there" when the URL information came from the Cogito style branches/there file did not update refs/heads/there (regression in 1.5.4).
* Bogus refspec configuration such as "remote.there.fetch = =" were not detected as errors (regressionin 1.5.4).
* You couldn't specify a custom editor whose path contains a whitespace via GIT_EDITOR (and core.editor).
* The subdirectory filter to "git filter-branch" mishandled a history where the subdirectory becomes empty and then later becomes non-empty.
* "git shortlog" gave an empty line if the original commit message was malformed (e.g. a botched import from foreign SCM). Now it finds the first non-empty line and uses it for better information.
* When the user fails to give a revision parameter to "git svn", an error from the Perl interpreter was issued because the script lacked proper error checking.
* After "git rebase" stopped due to conflicts, if the user played with "git reset" and friends, "git rebase --abort" failed to go back to the correct commit.
* Additional work trees prepared with git-new-workdir (in contrib/) did not share git-svn metadata directory .git/svn with the original.
* "git-merge-recursive" did not mark addition of the same path with different filemodes correctly as a conflict.
* "gitweb" gave malformed URL when pathinfo stype paths are in use.
* "-n" stands for "--no-tags" again for "git fetch".
* "git format-patch" did not detect the need to add 8-bit MIME header when the user used format.header configuration.
* "rev~" revision specifier used to mean "rev", which was inconsistent with how "rev^" worked. Now "rev~" is the same as "rev~1" (hence it also is the same as "rev^1"), and "rev~0" is the same as "rev^0" (i.e. it has to be a commit).
* "git quiltimport" did not grok empty lines, lines in "file -pNNN" format to specify the prefix levels and lines with trailing comments.
* "git rebase -m" triggered pre-commit verification, which made "rebase --continue" impossible.
As usual, it also comes with many documentation fixes and clarifications.
----------------------------------------------------------------
Changes since v1.5.4.4 are as follows:
Andy Whitcroft (1):
shortlog: take the first populated line of the descriptionBernt Hansen (1):
git-new-workdir: Share SVN meta data between work dirs and the repositoryBrandon Casey (1):
t/t3800-mktag.sh: use test_must_fail rather than '!'Clemens Buchacher (1):
merge-recursive: handle file mode changesDaniel Barkalow (2):
Tighten refspec processing
Fix branches file configurationEric Wong (1):
git-svn: don't blindly append '*' to branch/tags configGuanqun Lu (1):
Fix the wrong output of `git-show v1.3.0~155^2~4` in documentation.Jakub Narebski (1):
gitweb: Fix bug in href(..., -replay=>1) when using 'pathinfo' formJeff King (2):
t0021: tr portability fix for Solaris
Documentation: clarify use of .git{ignore,attributes} versus .git/info/*Johannes Schindelin (3):
launch_editor(): allow spaces in the filename
git fetch: Take '-n' to mean '--no-tags'
merge-file: handle empty files gracefullyJonas Fonseca (1):
Make man page building quiet when DOCBOOK_XSL_172 is definedJunio C Hamano (9):
filter-branch: handle "disappearing tree" case correctly in subdir filter
git-pull documentation: warn about the option order
quiltimport: fix misquoting of parsed -p<num> parameter
format-patch: generate MIME header as needed even when there is format.header
rebase -m: do not trigger pre-commit verification
Start draft ReleaseNotes for 1.5.4.5
git-fetch test: test tracking fetch results, not just FETCH_HEAD
Update draft release notes for 1.5.4.5
GIT 1.5.4.5Linus Torvalds (1):
rev-parse: fix meaning of rev~ vs rev~0.Marc-Andre Lureau (2):
git-svn: fix find-rev error message when missing arg
git-cvsimport: fix merging with remote parent branchMike Hommey (1):
git rebase --abort: always restore the right commitPierre Habouzit (1):
git-quiltimport: better parser to grok "enhanced" series files.Vineet Kumar (1):
Minor wording changes in the keyboard descriptions in git-add --interactive.