Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' while commits prefixed with '+' are in 'next'. The topics list the commits in reverse chronological order. The merge window for 1.5.5 is closed as of tonight, except for the promised git-gui (0.10) and gitk updates, and topics still cooking in 'next', and 1.5.5-rc0 will be tagged shortly. After that we will have quite a lot of regression fixes ahead of us, I am afraid. Since v1.5.4, a few commands have been reimplemented or made built-ins (checkout, remote, merge-recursive), and these inevitably involve "growing pains". While I am reasonably confident that we have long caught showstopper regressions in key features of these commands while they were cooking in 'next', I am sure there would remain regressions here and there in the periphery. It is unavoidable. POSIX-only people may say "why rewrite, if it involves this much pain", but like it or not, there are people stuck on unfortunate platforms that cannot run scripted versions well enough. Let's see if our regular contributors are as good at fixing their own screw-ups as they are good at coming up with new code, and hope that we can keep this rc cycle manageably short. Touch wood... ---------------------------------------------------------------- [New Topics] * jc/makefile (Wed Mar 12 01:46:26 2008 -0700) 2 commits - Makefile: flatten enumeration of headers, objects and programs - Makefile: DIFF_OBJS is not special at all these days I promised to do this immediately after -rc0, so this will shortly be in 'next' and then in 'master'. * jk/portable (Wed Mar 12 17:42:43 2008 -0400) 13 commits + t7505: use SHELL_PATH in hook + t9112: add missing #!/bin/sh header + filter-branch: use $SHELL_PATH instead of 'sh' + filter-branch: don't use xargs -0 + add NO_EXTERNAL_GREP build option + t6000lib: tr portability fix + t4020: don't use grep -a + add test_cmp function for test scripts + remove use of "tail -n 1" and "tail -1" + grep portability fix: don't use "-e" or "-q" + more tr portability test script fixes + t0050: perl portability fix + tr portability fixes Initially triggered by Solaris porting effort but these are harmless portability changes. Perhaps in 1.5.5, perhaps immediately after that. ---------------------------------------------------------------- [Dropped] * jc/test (Thu Feb 21 21:17:54 2008 -0800) 2 commits . tests: convert "cmp" and "cmp -s" to test_cmp . tests: test_cmp helper function This one may be more elaborate, but Jeff's patch is much simpler. ---------------------------------------------------------------- [Graduated to 'master'] * ph/maint-quiltimport (Wed Mar 12 21:07:19 2008 -0700) 2 commits + quiltimport: fix misquoting of parsed -p<num> parameter + git-quiltimport: better parser to grok "enhanced" series files. * mr/autoconf-fread (Tue Mar 11 09:48:34 2008 +0100) 1 commit + autoconf: Test FREAD_READS_DIRECTORIES ---------------------------------------------------------------- [Actively Cooking] * cc/help (Thu Mar 13 19:15:30 2008 -0700) 6 commits + Documentation/git-help: typofix + help: warn if specified 'man.viewer' is unsupported, instead of erroring out + Documentation: help: explain 'man.viewer' multiple values + help: implement multi-valued "man.viewer" config option + Documentation: help: describe 'man.viewer' config variable + help: add "man.viewer" config var to use "woman" or "konqueror" * db/diff-to-fp (Mon Mar 10 13:58:26 2008 -0400) 2 commits + wt-status.c: no need for dup() dance anymore + Write diff output to a file in struct diff_options * py/submodule (Wed Mar 12 09:30:01 2008 +0100) 6 commits + git-submodule summary: fix that some "wc" flavors produce leading spaces + git-submodule summary: test + git-submodule summary: documentation + git-submodule summary: limit summary size + git-submodule summary: show commit summary + git-submodule summary: code framework I didn't see anybody very supportive for this series, but I do not think this regresses existing other subcommands to "git submodule", so let's merge this to 'master' before 1.5.5 and see how useful submodule users find this. ---------------------------------------------------------------- [On Hold] * nd/worktree (Sun Mar 2 17:35:43 2008 +0700) 10 commits - Additional tests to capture worktree special cases - Documentation: update api-builtin and api-setup - Make setup_git_directory() auto-setup worktree if found - builtin-archive: mark unused prefix "unused_prefix" - Completely move out worktree setup from setup_git_directory_gently() - http-push: Avoid calling setup_git_directory() twice - Make setup_work_tree() return new prefix - Make get_git_dir() and 'git rev-parse --git-dir' absolute path - Make sure setup_git_directory is called before accessing repository - "git read-tree -m" and the like require worktree Every time we touch work-tree stuff we seem to unstabilize; this round seems more solid but I am still treading cautiously. Not sure if we want this for 1.5.5. * jc/unpack-careful (Fri Mar 7 08:39:53 2008 +0100) 5 commits + t5300: add test for "index-pack --strict" + receive-pack: allow using --strict mode for unpacking objects + unpack-objects: fix --strict handling + t5300: add test for "unpack-objects --strict" + unpack-objects: prevent writing of inconsistent objects This would re-instate the "unpack-objects --strict" but we probably should not do this before 1.5.5. * jc/rename (Fri Mar 7 14:03:19 2008 -0800) 2 commits - diffcore-rename: make file_table available outside exact rename detection + Optimize rename detection for a huge diff * jc/dirstat (Tue Feb 12 17:06:58 2008 -0800) 1 commit - diff: make --dirstat binary-file safe * lh/git-file (Wed Feb 20 23:13:16 2008 +0100) 4 commits - Teach GIT-VERSION-GEN about the .git file - Teach git-submodule.sh about the .git file - Teach resolve_gitlink_ref() about the .git file - Add platform-independent .git "symlink" The idea and the implementation seem Ok, but this leaves distinct feeling that it is a solution still waiting for a user (e.g. "git submodule" enhancements to take advantage of this facility to preserve the subrepository while switching between a revision with a submodule and another before the submodule was bound to the superproject). * nd/dashless (Wed Nov 28 23:21:57 2007 +0700) 1 commit - Move all dashed-form commands to libexecdir Scheduled for 1.6.0. I am not sure if we should merge this to 'next' before 1.5.5. Most active people will be on 'next' and if we have this there, the resulting 1.5.5 release might end up having issues that come from differences this one introduces. * jc/dashless (Sat Dec 1 22:09:22 2007 -0800) 2 commits - Prepare execv_git_cmd() for removal of builtins from the filesystem - git-shell: accept "git foo" form We do not plan to remove git-foo form completely from the filesystem at this point, but git-shell may need to be updated. * jc/sha1-lookup (Sun Dec 30 03:13:27 2007 -0800) 2 commits - sha1-lookup: make selection of 'middle' less aggressive - sha1-lookup: more memory efficient search in sorted list of SHA-1 Micro-optimization whose real world benefit is not proven. * jc/cherry-pick (Wed Feb 20 23:17:06 2008 -0800) 3 commits - WIP: rethink replay merge - Start using replay-tree merge in cherry-pick - revert/cherry-pick: start refactoring call to merge_recursive This is meant to improve cherry-pick's behaviour by not using merge-recursive, but unfortunately has stalled for some time now. * jc/stripspace (Sun Mar 9 00:30:35 2008 -0800) 6 commits - git-am --forge: add Signed-off-by: line for the author - git-am: clean-up Signed-off-by: lines - stripspace: add --log-clean option to clean up signed-off-by: lines - stripspace: use parse_options() - Add "git am -s" test - git-am: refactor code to add signed-off-by line for the committer Just my toy at this moment. -- 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
