The third rc for the next feature release GIT 1.5.4 is available at the usual places: http://www.kernel.org/pub/software/scm/git/ git-1.5.4.rc3.tar.{gz,bz2} (tarball) git-htmldocs-1.5.4.rc3.tar.{gz,bz2} (preformatted docs) git-manpages-1.5.4.rc3.tar.{gz,bz2} (preformatted docs) testing/git-*-1.5.4.rc3-1.$arch.rpm (RPM) Sorry, this is a few days late than I promised. Partly due to day-job pressure, partly because I am not familiar with RPM spec file and ended up failing to get the spec file into a reasonable shape after gitk i18n merge more than twice, and partly because I involved myself to discussion on the list I should not have been deeply involved in during the rc freeze. In any case, we managed to keep the changes only to fixes (both code and documentation) this round, aside from the promised gitk i18n enhancements. This should be pretty much the same as what we will have in final, hopefully due by the end of the month. Please give it a good beating. Especially if you care about the final RPM, and you are familiar with RPM generation, I would appreciate extra set of eyeballs to see if dependencies and other metainformation is set up correctly, as I do not think many people have tested it. ---------------------------------------------------------------- Changes since v1.5.4-rc2 are as follows: Alexandre Julliard (6): git.el: Support for getting diffs from inside the log-edit buffer. git.el: Retrieve the permissions for up-to-date files. git.el: Display file types and type changes. git.el: Make sure we never insert the same file twice. git.el: Refresh files from their real state upon commit. git.el: Make status refresh faster. Bernt Hansen (1): git-gui: Make commit log messages end with a newline Brandon Casey (1): git-relink.txt: describe more clearly how hard linking occurs Charles Bailey (1): gitk: Fix the Makefile to cope with systems lacking msgfmt Christian Couder (1): Documentation: config: add 'help.*' and 'instaweb.*' variables. Christian Stimming (10): gitk i18n: Add Makefile with rules for po file creation and installation gitk i18n: Import msgcat for message string translation; load translation catalogs gitk i18n: Markup several strings for translation gitk i18n: Initial German translation gitk i18n: More markup -- various options menus gitk i18n: Recode gitk from latin1 to utf8 so that the (c) copyright character is valid utf8. gitk: Update and fix Makefile gitk: Update German translation gitk: Fix typo in user message. gitk: Update German translation. Dan McGee (1): Documentation: rename gitlink macro to linkgit Eric Wong (4): git-svn: allow dcommit --no-rebase to commit multiple, dependent changes git-svn: unlink index files that were globbed, too git-svn: support for funky branch and project names over HTTP(S) git-svn: clarify the "Ignoring error from SVN" piece Florian La Roche (1): Change git-gc documentation to reflect gc.packrefs implementation. Gerrit Pape (1): gitk: use user-configured background in view definition dialog Grégoire Barbier (1): Fix double-free() in http-push.c:remote_exists() Gustaf Hendeby (1): Documentation/user-manual.txt: fix typo J. Bruce Fields (1): Documentation: fix remote.<name>.skipDefaultUpdate description James Bowes (1): Make the git metapackage require the same version of the subpackages. Jeff King (8): config: handle lack of newline at end of file better git-reset: refuse to do hard reset in a bare repository add a "basic" diff config callback diff: load funcname patterns in "basic" config diff: remove lazy config loading add--interactive: remove unused diff colors add--interactive: allow diff colors without interactive colors Document the color.interactive semantics Jim Meyering (3): Fix grammar nits in documentation and in code comments. Don't access line[-1] for a zero-length "line" from fgets. bundle, fast-import: detect write failure Johannes Schindelin (2): Optimize prefixcmp() shortlog: mention the "-e" option in the usage Johannes Sixt (2): git-gui: Move frequently used commands to the top of the context menu. recv_sideband: Do not use ANSI escape sequence on dumb terminals. Junio C Hamano (27): Documentation/git-submodule.txt: typofix "git pull --tags": error out with a better message. git-rebase -i behaves better on commits with incomplete messages git-rebase -i: clean-up error check codepath. lock_any_ref_for_update(): reject wildcard return from check_ref_format Update callers of check_ref_format() Uninline prefixcmp() git-clean: make "Would remove ..." path relative to cwd again t/t7600: avoid GNUism in grep t/t{3600,3800,5401}: do not use egrep when grep would do t/t3800: do not use a temporary file to hold expected result. Update draft release notes for 1.5.4 git-stash clear: refuse to work with extra parameter for now git-rev-parse --symbolic-full-name filter-branch: work correctly with ambiguous refnames custom pretty format: tolerate empty e-mail address Documentation: remove gitman.info with "make clean" Documentation: fix "gitlink::foobar[s]" utf8: pick_one_utf8_char() utf8_width(): allow non NUL-terminated input diff: do not chomp hunk-header in the middle of a character Update draft release notes for 1.5.4 GIT 1.5.3.8 "git-apply --check" should not report "fixed" pack-objects: remove redundant and wrong call to deflateEnd() RPM spec: include gitk message files. GIT 1.5.4-rc3 Kevin Ballard (1): Trim leading / off of paths in git-svn prop_walk Marco Costalba (2): Document git-reset defaults to HEAD if no commit is given git-stash: use stdout instead of stderr for non error messages Mark Levedahl (2): git-gui: Unconditionally use absolute paths with Cygwin Documentation/Makefile - honor $DESTDIR for quick-install target Martin Koegler (4): receive-pack: check object type of sha1 before using them as commits receive-pack: reject invalid refnames parse_tag_buffer: don't parse invalid tags tree-walk: don't parse incorrect entries Michael Stefaniuc (1): git-am: Run git gc only once and not for every patch. Michele Ballabio (1): Document some default values in config.txt Miklos Vajna (2): git-sh-setup: document git_editor() and get_author_ident_from_commit() t/t7001: avoid unnecessary ERE when using grep Nicolas Pitre (1): slightly better auto gc message Paul Mackerras (2): gitk: Recode de.po to UTF-8 gitk: Restore some widget options whose defaults changed in Tk 8.5 Peter Karlsson (1): Added Swedish translation. Ralf Wildenhues (1): Documentation: typofix Rogan Dawes (1): Allow git-mergetool to handle paths with a leading space Shawn O. Pearce (1): git-gui: Handle file mode changes (644->755) in diff viewer - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html