The latest maintenance release v1.5.1.2 is out. Tonight's 'master' contains 64-bit index, core subproject support, and gitattributes (but not the controversial "filter" part). As I promised I'd do something about attributes some time ago (I think it was during v1.5.1 stabilization period), I am reasonably happy with the state of 'master' right now. The other two major topics are also nice, unexpected bonus toward v1.5.2 from my point of view. Please expect stabilization cycle for v1.5.2 to start soon. ---------------------------------------------------------------- * The 'maint' branch has these fixes since the last announcement; these are all contained in v1.5.1.2, the latest maintenance release. Andrew Ruder (4): Update git-archive documentation Update git-cherry-pick documentation Fix unmatched emphasis tag in git-tutorial Update git-config documentation Andy Whitcroft (1): fix up strtoul_ui error handling Eric Wong (1): perl: install private Error.pm if the site version is older than our own Junio C Hamano (2): git-clone: fix dumb protocol transport to clone from pack-pruned ref GIT 1.5.1.2 Sam Vilain (1): git-tar-tree: complete deprecation conversion message * The 'master' branch has these since the last announcement in addition to the above. Alex Riesen (2): Tests for core subproject support Simplify calling of CR/LF conversion routines Alexandre Julliard (1): git.el: Add a commit description to the reflog. Aneesh Kumar K.V (1): gitview: annotation support Brian Gernhardt (1): Remove case-sensitive file in t3030-merge-recursive. James Bowes (1): Document git-check-attr Julian Phillips (1): refs.c: add a function to sort a ref list, rather then sorting on add Junio C Hamano (30): git-fetch--tool pick-rref git-fetch: use fetch--tool pick-rref to avoid local fetch from alternate Add basic infrastructure to assign attributes to paths Define 'crlf' attribute. Teach 'diff' about 'diff' attribute. Fix 'crlf' attribute semantics. Fix 'diff' attribute semantics. Makefile: add patch-ids.h back in. attribute macro support Define a built-in attribute macro "binary". Change attribute negation marker from '!' to '-'. Make sure quickfetch is not fooled with a previous, incomplete fetch. Allow more than true/false to attributes. merge-recursive: separate out xdl_merge() interface. Allow specifying specialized merge-backend per path. Add a demonstration/test of customized merge. Custom low-level merge driver support. Allow the default low-level merge driver to be configured. Custom low-level merge driver: change the configuration scheme. Allow low-level driver to specify different behaviour during internal merge. Fix funny types used in attribute value representation Counto-fix in merge-recursive Simplify code to find recursive merge driver. Documentation: support manual section (5) - file formats. Update 'crlf' attribute semantics. Document gitattributes(5) git-add -u: match the index with working tree. Fix bogus linked-list management for user defined merge drivers. convert.c: restructure the attribute checking part. lockfile: record the primary process. Linus Torvalds (21): diff-lib: use ce_mode_from_stat() rather than messing with modes manually Avoid overflowing name buffer in deep directory structures Add 'resolve_gitlink_ref()' helper function Add "S_IFDIRLNK" file mode infrastructure for git links Teach "fsck" not to follow subproject links Teach core object handling functions about gitlinks Fix thinko in subproject entry sorting Teach directory traversal about subprojects Teach git-update-index about gitlinks Don't show gitlink directories when we want "other" files Teach git list-objects logic not to follow gitlinks Teach "git-read-tree -u" to check out submodules as a directory Fix gitlink index entry filesystem matching Teach git list-objects logic to not follow gitlinks Teach "git-read-tree -u" to check out submodules as a directory Fix some "git ls-files -o" fallout from gitlinks Expose subprojects as special files to "git diff" machinery Use proper object allocators for unknown object nodes too Clean up object creation to use more common code Fix working directory errno handling when unlinking a directory Fix a copy-n-paste bug in the object decorator code. Nicolas Pitre (27): get rid of num_packed_objects() make overflow test on delta base offset work regardless of variable size add overflow tests on pack offset variables compute a CRC32 for each object as stored in a pack compute object CRC32 with index-pack pack-objects: learn about pack index version 2 index-pack: learn about pack index version 2 sha1_file.c: learn about index version 2 show-index.c: learn about index v2 pack-redundant.c: learn about index v2 allow forcing index v2 and 64-bit offset treshold validate reused pack data with CRC when possible simple random data generator for tests use test-genrandom in tests instead of /dev/urandom tests for various pack index features clean up add_object_entry() pack-objects: optimize preferred base handling a bit pack-objects: equal objects in size should delta against newer objects pack-objects: rework check_delta_limit usage pack-objects: clean up list sorting pack-objects: get rid of reuse_cached_pack pack-objects: get rid of create_final_object_list() pack-objects: make in_pack_header_size a variable of its own add get_size_from_delta() pack-objects: better check_object() performances pack-objects: remove obsolete comments document --index-version for index-pack and pack-objects Shawn O. Pearce (2): Contribute a fairly paranoid update hook Kill the useless progress meter in merge-recursive - 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