From 3bfece3adf44bcf315b708aeb3f2f54a62bd9aac Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Apr 2009 01:06:54 -0700 Subject: [PATCH] What's cooking (2009/04 #01) --- whats-cooking.txt | 271 +++++++++++++++++++++++----------------------- 1 file changed, 134 insertions(+), 137 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 072640848c..5569e63251 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Mar 2009, #07; Mon, 30) -X-master-at: 442dd42d6d4903640b0dc5561481a77c88dcea90 -X-next-at: 233382b233530fc38969fd1f31dec27e342c2a9f +Subject: What's cooking in git.git (Apr 2009, #01; Mon, 06) +X-master-at: fbdc05661d9b732d06c47ccb3d5836d0d1b563e5 +X-next-at: 5efaefce91ae81a7490893cc6245a3f52998b522 -What's cooking in git.git (Mar 2009, #07; Mon, 30) +What's cooking in git.git (Apr 2009, #01; Mon, 06) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -17,6 +17,54 @@ meant to be merged to the maintenance series have "maint-" in their names. ---------------------------------------------------------------- [New Topics] +* mh/html-path (Sun Apr 5 04:15:16 2009 +0200) 1 commit + + add --html-path to get the location of installed HTML docs + +* lt/reflog-expire (Mon Mar 30 21:34:14 2009 -0700) 2 commits + + Speed up reflog pruning of unreachable commits + + Clean up reflog unreachability pruning decision + +* bs/maint-1.6.0-tree-walk-prefix (Wed Apr 1 19:34:03 2009 -0700) 2 commits + + match_tree_entry(): a pathspec only matches at directory + boundaries + + tree_entry_interesting: a pathspec only matches at directory + boundary + +* ms/http-auth (Wed Apr 1 19:48:24 2009 +0300) 1 commit + + Allow curl to rewind the read buffers + +* js/maint-submodule-checkout (Thu Apr 2 15:30:25 2009 +0200) 1 commit + + Fix 'git checkout ' to update the index + +* cb/maint-merge-recursive-submodule-fix (Sun Apr 5 02:47:00 2009 +0200) 3 commits + + simplify output of conflicting merge + + update cache for conflicting submodule entries + + add tests for merging with submodules + +* fg/remote-prune (Fri Apr 3 11:03:44 2009 +0200) 2 commits + + git remote update: New option --prune + + builtin-remote.c: Split out prune_remote as a separate function. + +These should go to 'master' soonish. + +* cc/sha1-bsearch (Mon Apr 6 00:48:49 2009 -0700) 3 commits + - sha1-lookup: fix up the assertion message + - patch-ids: use the new generic "sha1_pos" function to lookup sha1 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup + sha1 + +I think this is Ok for 'next', but somebody might want to prove me wrong +by running some benchmarks. + +---------------------------------------------------------------- +[Will Discard] + +* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 1 commit + - checkout -: make "-" to mean "previous branch" everywhere + +---------------------------------------------------------------- +[Graduated to "master"] + * cj/doc-format (Fri Mar 27 00:36:47 2009 -0700) 11 commits + Merge branch 'cj/doc-quiet' into cj/doc-format + Documentation: option to render literal text as bold for manpages @@ -37,15 +85,6 @@ meant to be merged to the maintenance series have "maint-" in their names. + Documentation/Makefile: break up texi pipeline + Documentation/Makefile: make most operations "quiet" -I think these are ready for 'master'. - -* jc/name-branch-iffy (Sat Mar 21 14:30:21 2009 -0700) 3 commits - - checkout -: make "-" to mean "previous branch" everywhere - - Don't permit ref/branch names to end with ".lock" - - check_ref_format(): tighten refname rules - -After all the bottom two are probably not so iffy. - * jc/name-branch (Sat Mar 21 14:35:51 2009 -0700) 5 commits + strbuf_check_branch_ref(): a helper to check a refname for a branch @@ -66,34 +105,8 @@ After all the bottom two are probably not so iffy. + pretty.c: add %f format specifier to format_commit_message() * mg/tracked-local-branches (Thu Mar 26 21:53:25 2009 +0100) 2 commits - - [Reroll requested] Make local branches behave like remote branches - when --tracked - - Test for local branches being followed with --track - -* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 15 commits - - bisect--helper: string output variables together with "&&" - - rev-list: pass "int flags" as last argument of "show_bisect_vars" - - t6030: test bisecting with paths - - bisect: use "bisect--helper" and remove "filter_skipped" function - - bisect: implement "read_bisect_paths" to read paths in - "$GIT_DIR/BISECT_NAMES" - - bisect--helper: implement "git bisect--helper" - - rev-list: call new "filter_skip" function - + rev-list: pass "revs" to "show_bisect_vars" - + rev-list: make "show_bisect_vars" non static - + rev-list: move code to show bisect vars into its own function - + rev-list: move bisect related code into its own file - + rev-list: make "bisect_list" variable local to "cmd_rev_list" - + refs: add "for_each_ref_in" function to refactor "for_each_*_ref" - functions - + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv - array - + quote: implement "sq_dequote_many" to unwrap many args in one - string - -I've reordered them to make the early three patches independent to the -rest of the series. Dscho had a suggestion on the search it internally -does, so we might see further reroll of some patches in the series. + + Make local branches behave like remote branches when --tracked + + Test for local branches being followed with --track * jc/shared-literally (Fri Mar 27 23:21:00 2009 -0700) 4 commits + set_shared_perm(): sometimes we know what the final mode bits @@ -115,78 +128,9 @@ does, so we might see further reroll of some patches in the series. + builtin-fast-export.c: turn error into warning + test-suite: adding a test for fast-export with tag variants ----------------------------------------------------------------- -[Graduated to "master"] - -* jk/reflog-date (Fri Mar 20 02:00:43 2009 -0400) 1 commit - + make oneline reflog dates more consistent with multiline format - -* js/maint-1.6.0-exec-path-env (Wed Mar 18 08:42:53 2009 +0100) 1 commit - + export GIT_EXEC_PATH when git is run with --exec-path - -* jc/maint-1.6.0-blame-s (Wed Mar 18 00:13:03 2009 -0700) 1 commit - + blame: read custom grafts given by -S before calling - setup_revisions() - -The above are all ready for 'next'. - -* dm/maint-docco (Thu Mar 19 20:35:34 2009 -0700) 6 commits - + Documentation: reword example text in git-bisect.txt. - + Documentation: reworded the "Description" section of git- - bisect.txt. - + Documentation: minor grammatical fixes in git-branch.txt. - + Documentation: minor grammatical fixes in git-blame.txt. - + Documentation: reword the "Description" section of git-bisect.txt. - + Documentation: minor grammatical fixes in git-archive.txt. - -* mg/test-installed (Mon Mar 16 18:03:12 2009 +0100) 2 commits - + test-lib.sh: Allow running the test suite against installed git - + test-lib.sh: Test for presence of git-init in the right path. - -* jc/attributes-checkout (Fri Mar 20 10:32:09 2009 +0100) 2 commits - + Add a test for checking whether gitattributes is honored by - checkout. - + Read attributes from the index that is being checked out - -Original issue identified, and test provided by Kristian Amlie. - -* fg/push-default (Mon Mar 16 16:42:52 2009 +0100) 2 commits - + Display warning for default git push with no push.default config - + New config push.default to decide default behavior for push - -* mg/http-auth (Wed Mar 18 18:46:41 2009 -0500) 6 commits - + http-push.c: use a faux remote to pass to http_init - + Do not name "repo" struct "remote" in push_http.c - + http.c: CURLOPT_NETRC_OPTIONAL is not available in ancient - versions of cURL - + http authentication via prompts - + http_init(): Fix config file parsing - + http.c: style cleanups - -Amos King added push side support on top of my fetch side support. - -We may want to also pass --remote parameter from git-push to this backend -as Daniel did as an interim solution for the fetch side, so that we can -handle the configuration better. - -* db/push-cleanup (Sun Mar 8 21:06:07 2009 -0400) 2 commits - + Move push matching and reporting logic into transport.c - + Use a common function to get the pretty name of refs - ----------------------------------------------------------------- -[Will merge to 'master' soon] - * kb/tracking-count-no-merges (Wed Mar 4 18:47:39 2009 +0100) 1 commit + stat_tracking_info(): only count real commits -This gives the merge commits zero weight when talking about how many -commits you have ahead (or behind) of the branch you are tracking. Even -though I agree that they should carry much less weight than the "real" -commits, because your repeated merge from the other branch does not really -add any real value to the end result, giving them absolute zero weight -somehow feels wrong. At least it shows that your have been _active_ on the -branch. But I do not feel very strongly about it. - * jc/maint-1.6.0-keep-pack (Sat Mar 21 17:26:11 2009 -0500) 6 commits + pack-objects: don't loosen objects available in alternate or kept packs @@ -204,7 +148,8 @@ branch. But I do not feel very strongly about it. * ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit - blame.c: start libifying the blame infrastructure -A few minor point remains in this initial one. +A few minor point remains in this initial one. I hate to do these minor +fix-ups myself, but I may end up doing so... * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit - Allow --date=local --date=other-format to work as expected @@ -244,23 +189,6 @@ in binary mode as well. - Add specification of git-vcs helpers - Add "vcs" config option in remotes -* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 11 commits - - builtin-replace: use "usage_msg_opt" to give better error messages - - parse-options: add new function "usage_msg_opt" - - builtin-replace: teach "git replace" to actually replace - - Add new "git replace" command - - environment: add global variable to disable replacement - - mktag: call "check_sha1_signature" with the replacement sha1 - - replace_object: add a test case - - object: call "check_sha1_signature" with the replacement sha1 - - sha1_file: add a "read_sha1_file_repl" function - - replace_object: add mechanism to replace objects found in - "refs/replace/" - - refs: add a "for_each_replace_ref" function - -I know, I really have to drop everything else and re-read these, but I -haven't managed to. - * js/notes (Wed Feb 18 11:17:27 2009 -0800) 14 commits - tests: fix "export var=val" - notes: refuse to edit notes outside refs/notes/ @@ -277,15 +205,16 @@ haven't managed to. - Add a script to edit/inspect notes - Introduce commit notes -* hv/cvsps-tests (Wed Mar 18 18:33:41 2009 +0100) 7 commits +* hv/cvsps-tests (Sun Apr 5 01:40:50 2009 -0700) 8 commits + - t/t9600: remove exit after test_done - cvsimport: extend testcase about patchset order to contain branches - cvsimport: add test illustrating a bug in cvsps - - Add a test of "git cvsimport"'s handling of tags and branches - - Add some tests of git-cvsimport's handling of vendor branches - - Test contents of entire cvsimported "master" tree contents - - Use CVS's -f option if available (ignore user's ~/.cvsrc file) - - Start a library for cvsimport-related tests + + Add a test of "git cvsimport"'s handling of tags and branches + + Add some tests of git-cvsimport's handling of vendor branches + + Test contents of entire cvsimported "master" tree contents + + Use CVS's -f option if available (ignore user's ~/.cvsrc file) + + Start a library for cvsimport-related tests Two cvsimport test topics were rewound from 'next' and merged into this one. I'll keep this in 'pu' so that people can polish their cvsps skilz @@ -294,15 +223,83 @@ to resolve issues these tests identify. ---------------------------------------------------------------- [Actively cooking] -* da/difftool (Tue Mar 24 23:29:59 2009 -0700) 5 commits +* da/difftool (Sat Apr 4 21:00:24 2009 -0700) 25 commits + - mergetool--lib: add new merge tool TortoiseMerge + - mergetool--lib: make (g)vimdiff workable under Windows + - mergetool--lib: consolidate the last redundant bits in + {diff,merge}tool + - mergetool-lib: specialize opendiff options when in diff mode + - mergetool-lib: refactor run_mergetool and check_unchanged + - bash completion: add git-difftool + - {diff,merge}tool: rename helpers to remove them from tab- + completion + - mergetool-lib: add diffuse as merge and diff tool + - mergetool-lib: specialize xxdiff options when in diff mode + - mergetool-lib: specialize kdiff3 options when in diff mode + - mergetool: use run_mergetool from git-mergetool-lib + - difftool: use run_mergetool from git-mergetool-lib + - mergetool-lib: introduce run_mergetool + - difftool: use valid_tool from git-mergetool-lib + - mergetool: use valid_tool from git-mergetool-lib + - difftool: use get_mergetool_path from git-mergetool-lib + - mergetool: use get_mergetool_path from git-mergetool-lib + - Add a mergetool-lib scriptlet for holding common merge tool + functions + - mergetool: use $( ... ) instead of `backticks` + - difftool: add support for a difftool.prompt config variable - difftool: add a -y shortcut for --no-prompt - difftool: use perl built-ins when testing for msys - difftool: add various git-difftool tests - difftool: add git-difftool to the list of commands + difftool: move 'git-difftool' out of contrib -David has further refactoring which was a bit too early for me to pick -up. +* cc/bisect-filter (Mon Mar 30 06:59:59 2009 +0200) 19 commits + - bisect--helper: string output variables together with "&&" + - rev-list: pass "int flags" as last argument of "show_bisect_vars" + - t6030: test bisecting with paths + - bisect: use "bisect--helper" and remove "filter_skipped" function + - bisect: implement "read_bisect_paths" to read paths in + "$GIT_DIR/BISECT_NAMES" + - bisect--helper: implement "git bisect--helper" + - bisect: use the new generic "sha1_pos" function to lookup sha1 + - rev-list: call new "filter_skip" function + - Merge branch 'cc/sha1-bsearch' into HEAD + - patch-ids: use the new generic "sha1_pos" function to lookup sha1 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup + sha1 + + rev-list: pass "revs" to "show_bisect_vars" + + rev-list: make "show_bisect_vars" non static + + rev-list: move code to show bisect vars into its own function + + rev-list: move bisect related code into its own file + + rev-list: make "bisect_list" variable local to "cmd_rev_list" + + refs: add "for_each_ref_in" function to refactor "for_each_*_ref" + functions + + quote: add "sq_dequote_to_argv" to put unwrapped args in an argv + array + + quote: implement "sq_dequote_many" to unwrap many args in one + string + +Re-rolled and made earlier parts ready for 'master'. I think we should +move this to 'next' soonish and aim to have it in 1.6.3 + +* cc/replace (Mon Feb 2 06:13:06 2009 +0100) 13 commits + - builtin-replace: use "usage_msg_opt" to give better error messages + - parse-options: add new function "usage_msg_opt" + - builtin-replace: teach "git replace" to actually replace + - Add new "git replace" command + - environment: add global variable to disable replacement + - mktag: call "check_sha1_signature" with the replacement sha1 + - replace_object: add a test case + - object: call "check_sha1_signature" with the replacement sha1 + - sha1_file: add a "read_sha1_file_repl" function + - replace_object: add mechanism to replace objects found in + "refs/replace/" + - refs: add a "for_each_replace_ref" function + - patch-ids: use the new generic "sha1_pos" function to lookup sha1 + - sha1-lookup: add new "sha1_pos" function to efficiently lookup + sha1 + +Re-rolled based on the updated binary search API. ---------------------------------------------------------------- [On Hold]