v1.5.1.4 is out.
Thanks to HPA who installed libdbi-dbd interface to sqlite on kernel.org machines, Frank's cvsserver tests are now in 'master', along with updates to gitweb and git-gui. I've thrown in the diff-tree memory optimization we discussed in the OOo thread as well.
I haven't tagged the tip of the 'master', but this is pretty much 1.5.2-rc3 -- I may tag it tomorrow with a few more fixes I noticed are needed while I was reviewing the list traffic (I updated todo:TODO with them).
v1.5.2 final is scheduled for sometime late next week, hopefully with git-gui v0.7.0 final.
----------------------------------------------------------------
* The 'maint' branch is now at 1.5.1.4, with these fixes since the last announcement.
Amos Waterland (1): wcwidth redeclaration
J. Bruce Fields (7): user-manual: more discussion of detached heads, fix typos user-manual: add section ID's user-manual: clean up fast-forward and dangling-objects sections user-manual: fix .gitconfig editing examples user-manual: miscellaneous editing user-manual: stop deprecating the manual user-manual: fix clone and fetch typos
Jeff King (1): Documentation: don't reference non-existent 'git-cvsapplycommit'
Junio C Hamano (1): GIT v1.5.1.4
Paul Mackerras (1): gitk: Allow user to choose whether to see the diff, old file, or new file
Quy Tonthat (1): Add howto files to rpm packages.
Shawn O. Pearce (1): git-gui: Allow spaces in path to 'wish'
* The 'master' branch has these since the last announcement in addition to the above.
Alex Riesen (1): Use GIT_OBJECT_DIR for temporary files of pack-objects
Frank Lichtenheld (1): cvsserver: Add test cases for git-cvsserver
Jakub Narebski (6): gitweb: Add parsing of raw combined diff format to parse_difftree_raw_line gitweb: Add combined diff support to git_difftree_body gitweb: Add combined diff support to git_patchset_body gitweb: Make it possible to use pre-parsed info in git_difftree_body gitweb: Show combined diff for merge commits in 'commitdiff' view gitweb: Show combined diff for merge commits in 'commit' view
Junio C Hamano (5): diff: release blobs after generating textual diff. diff.c: do not use a separate "size cache". diff -M: release the preimage candidate blobs after rename detection. diff -S: release the image after looking for needle in it Update documentation links to point at 1.5.1.4
Matthieu Moy (2): Document git add -u introduced earlier. Added a reference to git-add in the documentation for git-update-index
Michael Spang (3): dir.c: Omit non-excluded directories with dir->show_ignored t7300: Basic tests for git-clean Fix minor documentation errors
Shawn O. Pearce (17): git-gui: Correctly handle UTF-8 encoded commit messages git-gui: Include the subject in the status bar after commit git-gui: Warn users before making an octopus merge git-gui: Correct line wrapping for too many branch message git-gui: Cleanup common font handling for font_ui git-gui: Use option database defaults to set the font git-gui: Refactor to use our git proc more often git-gui: Track our own embedded values and rebuild when they change git-gui: Refactor into multiple files to save my sanity git-gui: Move console procs into their own namespace git-gui: Allow vi keys to scroll the diff/blame regions git-gui: Move merge support into a namespace git-gui: Show all possible branches for merge git-gui: Include commit id/subject in merge choices git-gui: Use vi-like keys in merge dialog Remove duplicate exports from Makefile Use .git/MERGE_MSG in cherry-pick/revert
Theodore Ts'o (2): Add pack.depth option to git-pack-objects. Increase pack.depth default to 50