From 392dc53866edf0d65345b7156f3387d67189f282 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sun, 31 May 2009 18:21:29 -0700 Subject: [PATCH] What's cooking (2009/05 #04) --- whats-cooking.txt | 319 ++++++++++++++++++++---------------------------------- 1 file changed, 116 insertions(+), 203 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index d9fe4afefc..a08e938c0a 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 (May 2009, #03; Mon, 25) -X-master-at: 9619ff14159ab3401636b9883a715b0f20b051df -X-next-at: 2435664148ab70c34750a9f1339d4ca898bd289e +Subject: What's cooking in git.git (May 2009, #04; Sun, 31) +X-master-at: f9275c68af58e0f65e1557b5109ccbfdbbbc384a +X-next-at: 426b5a935392df623347be0aea16bca045d44b52 -What's cooking in git.git (May 2009, #03; Mon, 25) +What's cooking in git.git (May 2009, #04; Sun, 31) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -17,27 +17,49 @@ meant to be merged to the maintenance series have "maint-" in their names. ---------------------------------------------------------------- [New Topics] -* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 5 commits - - parse-opts: add OPT_FILENAME and transition builtins - - parse-opts: prepare for OPT_FILENAME - - Merge branch 'jc/mktree' into sb/opt-filename - - Merge branch 'sb/format-patch-parseopt' into sb/opt-filename - - Merge branch 'sb/show-branch-parse-options' into sb/opt-filename - - Merge branch 'master' into sb/opt-filename - + apply, fmt-merge-msg: use relative filenames - + commit: -F overrides -t +All of these are soon to be in 'next'. -There are quite a few new callers to parse_options() in 'next' and 'pu' -that are more likely to graduate before this series, so for now I merged a -few of them and adjusted the commit "prepare for OPT_FILENAME". I tried -to be careful but extra sets of eyeballs would be helpful. +* bc/solaris (Wed May 27 21:17:08 2009 -0500) 4 commits + - Makefile: introduce SANE_TOOL_PATH for prepending required + elements to PATH + - Makefile: add section for SunOS 5.7 + - Makefile: add NEEDS_RESOLV to optionally add -lresolv to compile + arguments + - Makefile: use /usr/ucb/install on SunOS platforms rather than + ginstall -* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit - + mergetool--lib: add support for araxis merge +* nw/maint-cvsexportcommit (Fri May 29 00:23:33 2009 +0100) 1 commit + - git-cvsexportcommit can't commit files which have been removed + from CVS + +* tr/maint-doc-stash-pop (Thu May 28 11:40:15 2009 +0200) 1 commit + - Documentation: teach stash/pop workflow instead of stash/apply + +* da/pretty-tempname (Sun May 31 01:35:52 2009 -0700) 3 commits + - diff: generate pretty filenames in prep_temp_blob() + - compat: add a basename() compatibility function + - compat: add a mkstemps() compatibility function + +* ak/maint-for-each-ref-no-lookup (Wed May 27 15:23:12 2009 -0400) 1 commit + - for-each-ref: Do not lookup objects when they will not be used + +* cb/match_refs_internal_tail (Wed May 27 22:13:44 2009 +0200) 1 commit + - match_refs: search ref list tail internally + +I need to replace this with the new iteration... + +* gb/am-foreign (Wed May 27 11:25:19 2009 +0200) 4 commits + - git-am: refactor 'cleaning up and aborting' + - git-am foreign patch support: StGIT support + - git-am foreign patch support: autodetect some patch formats + - git-am foreign patch support: introduce patch_format + +---------------------------------------------------------------- +[Graduated to "master"] -I admit that I feel certain distaste in supporting a closed tool, but we -already make things bearable for people on Windows; Araxis is no worse, -right? +* sb/opt-filename (Sat May 23 11:53:13 2009 -0700) 2 commits + + parse-opts: add OPT_FILENAME and transition builtins + + parse-opts: prepare for OPT_FILENAME * rs/maint-grep-word-regexp-fix (Sat May 23 13:45:26 2009 +0200) 1 commit + grep: fix word-regexp at the beginning of lines @@ -71,158 +93,10 @@ right? + apply, fmt-merge-msg: use relative filenames + commit: -F overrides -t -* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits - - Avoid "diff-index --cached" optimization under --find-copies- - harder - - Optimize "diff-index --cached" using cache-tree - - t4007: modernize the style - - cache-tree.c::cache_tree_find(): simplify inernal API - - write-tree --ignore-cache-tree - * jc/solaris-0811 (Fri May 22 22:55:31 2009 -0700) 2 commits - OpenSolaris 200811 (SunOS 5.11) does not want OLD_ICONV - Teach Solaris that _XOPEN_SOURCE=600 really menas XPG6 -* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits - - Change xdl_merge to generate output even for null merges - - t6023: merge-file fails to output anything for a degenerate merge - -* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits - - diff: Rename QUIET internal option to QUICK - - diff: change semantics of "ignore whitespace" options - ----------------------------------------------------------------- -[Graduated to "master"] - -* cc/bisect (Sat May 9 17:55:47 2009 +0200) 20 commits - + bisect: make "git bisect" use new "--next-all" bisect-helper - function - + bisect: add "check_good_are_ancestors_of_bad" function - + bisect: implement the "check_merge_bases" function - + bisect: automatically sort sha1_array if needed when looking it up - + bisect: make skipped array functions more generic - + bisect: remove too much function nesting - + bisect: use new "struct argv_array" to prepare argv for - "setup_revisions" - + bisect: store good revisions in a "sha1_array" - + bisect: implement "rev_argv_push" to fill an argv with revs - + bisect: use "sha1_array" to store skipped revisions - + am: simplify "sq" function by using "git rev-parse --sq-quote" - + bisect: use "git rev-parse --sq-quote" instead of a custom "sq" - function - + rev-parse: add --sq-quote to shell quote arguments - + rev-list: remove stringed output flag from "show_bisect_vars" - + bisect--helper: remove "--next-vars" option as it is now useless - + bisect: use "git bisect--helper --next-exit" in "git-bisect.sh" - + bisect--helper: add "--next-exit" to output bisect results - + bisect: move common bisect functionality to "bisect_common" - + rev-list: refactor printing bisect vars - + rev-list: make "estimate_bisect_steps" non static - -Rewriting major part of "git-bisect" shell script continues. The patches -seem to be reasonably clean. - -* fc/decorate-tag (Thu May 14 00:32:53 2009 +0300) 2 commits - + Prettify log decorations even more - + Change prettify_ref to prettify_refname - -* mg/track (Mon May 11 16:42:54 2009 +0200) 2 commits - + Fix behavior with non-commit upstream references - + Test tracking of non-commit upstreams - -* jn/gitweb-cleanup (Mon May 11 19:45:11 2009 +0200) 8 commits - + gitweb: Remove unused $hash_base parameter from - normalize_link_target - + gitweb: Simplify snapshot format detection logic in - evaluate_path_info - + gitweb: Use capturing parentheses only when you intend to capture - + gitweb: Replace wrongly added tabs with spaces - + gitweb: Use block form of map/grep in a few cases more - + gitweb: Always use three argument form of open - + gitweb: Always use three argument form of open - + gitweb: Do not use bareword filehandles - -* js/maint-no-ln-across-libexec-and-bin (Mon May 11 13:02:18 2009 +0200) 1 commit - + Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile - -* tp/send-email-from-config (Tue May 12 15:48:56 2009 -0700) 1 commit - + send-email: Add config option for sender address - -* ae/anon-fetch-info (Fri Apr 17 10:20:11 2009 +0200) 1 commit - + fetch: Strip usernames from url's before storing them - -* ac/graph-horizontal-line (Tue Apr 21 08:47:01 2009 -0400) 1 commit - + graph API: Use horizontal lines for more compact graphs - -* mh/show-branch-color (Sat Apr 25 13:46:14 2009 +0200) 2 commits - + bash completion: show-branch color support - + show-branch: color the commit status signs - -* mh/diff-stat-color (Sat Apr 25 00:06:47 2009 +0200) 1 commit - + diff: do not color --stat output like patch context - -* js/add-edit (Mon Apr 27 19:51:42 2009 +0200) 2 commits - + t3702: fix reliance on SHELL_PATH being '/bin/sh' - + git-add: introduce --edit (to edit the diff vs. the index) - -* jk/maint-add-empty (Tue Apr 28 23:21:01 2009 -0400) 1 commit - + add: don't complain when adding empty project root - -* ar/unlink-err (Wed Apr 29 23:24:52 2009 +0200) 3 commits - + print unlink(2) errno in copy_or_link_directory - + replace direct calls to unlink(2) with unlink_or_warn - + Introduce an unlink(2) wrapper which gives warning if unlink - failed - -* ar/merge-one-file-diag (Wed Apr 29 23:40:50 2009 +0200) 1 commit - + Clarify kind of conflict in merge-one-file helper - -* np/push-delta (Fri May 1 16:56:47 2009 -0400) 1 commit - + allow OFS_DELTA objects during a push - -* mt/submodule-reference (Mon May 4 22:30:01 2009 +0300) 1 commit - + Add --reference option to git submodule. - -* fl/git-pm (Thu May 7 15:41:28 2009 +0200) 2 commits - + Git.pm: Always set Repository to absolute path if autodetecting - + Git.pm: Set GIT_WORK_TREE if we set GIT_DIR - -* rs/grep-parseopt (Thu May 7 21:46:48 2009 +0200) 5 commits - + grep: use parseopt - + grep: remove global variable builtin_grep - + parseopt: add PARSE_OPT_NODASH - + parseopt: add OPT_NUMBER_CALLBACK - + parseopt: add OPT_NEGBIT - -* jk/no-no-no-empty-directory (Fri May 8 01:01:17 2009 -0400) 2 commits - + parseopt: add OPT_NEGBIT - + parseopt: add OPT_NEGBIT - -* jk/maint-1.6.0-trace-argv (Fri May 8 05:06:15 2009 -0400) 1 commit - + fix GIT_TRACE segfault with shell-quoted aliases - -* hv/sample-update (Fri May 8 17:22:30 2009 +0200) 1 commit - + Extend sample update hook, disable modifying of existing tags - -* rr/forbid-bs-in-ref (Fri May 8 07:32:37 2009 +0200) 1 commit - + Disallow '\' in ref names - -* do/maint-merge-recursive-fix (Sat May 9 14:49:59 2009 -0700) 1 commit - + merge-recursive: never leave index unmerged while recursing - -* jm/format-patch-no-auto-n-when-k-is-given (Sat May 9 10:12:01 2009 +0200) 1 commit - + format-patch let -k override a config-specified format.numbered - -* lt/maint-diff-reduce-lstat (Sat May 9 15:11:17 2009 -0700) 2 commits - + Teach 'git checkout' to preload the index contents - + Avoid unnecessary 'lstat()' calls in 'get_stat_data()' - -* da/mergetool-lib (Sat May 2 01:57:21 2009 -0700) 1 commit - + mergetool--lib: specialize diff options for emerge and ecmerge - ----------------------------------------------------------------- -[Will merge to "master" soon] - * mw/send-email (Mon Apr 13 13:23:52 2009 -0500) 6 commits + send-email: Remove superfluous `my $editor = ...' + send-email: 'References:' should only reference what is sent @@ -232,10 +106,26 @@ seem to be reasonably clean. sendemail.multiedit + Docs: send-email: Put options back into alphabetical order -* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit - + git-submodule: add support for --rebase. +* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits + + mktree: validate entry type in input + + mktree --batch: build more than one tree object + + mktree --missing: updated usage message and man page + + mktree --missing: allow missing objects + + t1010: add mktree test + + mktree: do not barf on a submodule commit + + builtin-mktree.c: use a helper function to handle one line of + input + + mktree: use parse-options + + build-in git-mktree + +* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits + + Revert "git-add--interactive: remove hunk coalescing" + + Splitting a hunk that adds a line at the top fails in "add -p" -* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits +* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit + + format-patch: migrate to parse-options API + +* cc/bisect (Sun May 17 17:36:46 2009 +0200) 3 commits (early part) + bisect: check ancestors without forking a "git rev-list" process + commit: add function to unparse a commit and its parents + bisect: rework some rev related functions to make them more @@ -244,6 +134,22 @@ seem to be reasonably clean. ---------------------------------------------------------------- [Stalled and may need help and prodding to go forward] +* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits + - Teach "-m " and "-F " to "git notes edit" + - Add an expensive test for git-notes + - Speed up git notes lookup + - Add a script to edit/inspect notes + - Introduce commit notes + +Dscho asked about the performance implications of this; I do not think I +saw any progress on that yet... + +* ph/submodule-rebase (Fri Apr 24 09:06:38 2009 +1000) 1 commit + + git-submodule: add support for --rebase. + +There was a discussion on --rebase vs --merge and needs for unified +configuration variable handling for this patch... + * lt/read-directory (Fri May 15 12:01:29 2009 -0700) 3 commits - Add initial support for pathname conversion to UTF-8 - read_directory(): infrastructure for pathname character set @@ -314,53 +220,61 @@ in binary mode as well. ---------------------------------------------------------------- [Actively cooking] -* jc/mktree (Thu May 14 15:49:10 2009 -0700) 9 commits - + mktree: validate entry type in input - + mktree --batch: build more than one tree object - + mktree --missing: updated usage message and man page - + mktree --missing: allow missing objects - + t1010: add mktree test - + mktree: do not barf on a submodule commit - + builtin-mktree.c: use a helper function to handle one line of - input - + mktree: use parse-options - + build-in git-mktree +* da/araxis-mergetool (Sun May 24 00:24:41 2009 +0000) 1 commit + + mergetool--lib: add support for araxis merge -* jc/maint-add-p-coalesce-fix (Sat May 16 10:48:23 2009 -0700) 2 commits - + Revert "git-add--interactive: remove hunk coalescing" - + Splitting a hunk that adds a line at the top fails in "add -p" +* jc/cache-tree (Fri May 22 23:14:25 2009 -0700) 5 commits + + Avoid "diff-index --cached" optimization under --find-copies- + harder + + Optimize "diff-index --cached" using cache-tree + + t4007: modernize the style + + cache-tree.c::cache_tree_find(): simplify internal API + + write-tree --ignore-cache-tree -* sb/format-patch-parseopt (Sat May 16 02:24:46 2009 -0700) 1 commit - + format-patch: migrate to parse-options API +* cb/maint-1.6.0-xdl-merge-fix (Mon May 25 01:21:14 2009 +0100) 2 commits + - Change xdl_merge to generate output even for null merges + - t6023: merge-file fails to output anything for a degenerate merge -* jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits - - Teach "-m " and "-F " to "git notes edit" - - Add an expensive test for git-notes - - Speed up git notes lookup - - Add a script to edit/inspect notes - - Introduce commit notes +Soon in 'next'; + +* jc/diff-whitespace-only-status (Sat May 23 01:15:35 2009 -0700) 2 commits + - diff: Rename QUIET internal option to QUICK + - diff: change semantics of "ignore whitespace" options + +* cc/bisect (Thu May 28 23:21:16 2009 +0200) 2 commits + - bisect: display first bad commit without forking a new process + - bisect: drop unparse_commit() and use clear_commit_marks() + +Soon in 'next'; -* rc/http-push (Mon May 18 16:14:24 2009 +0800) 15 commits +* rc/http-push (Sat May 30 01:59:50 2009 +0800) 21 commits - http*: add helper methods for fetching objects (loose) - - http*: add helper methods for fetching objects/info/packs - http*: add helper methods for fetching packs - - http*: add fetch_http_pack_index + - http: use new http API in fetch_index() + - http*: add http_get_info_packs + - Use the new http API in fetch_symref() + - Use the new http API in update_remote_info_refs() + - Use the new http API in http_fetch_ref() + - Use the new http API in get_refs_via_curl() + - Two new functions for the http API - http: create function end_url_with_slash - http*: move common variables and macros to http.[ch] + - Some cleanup in get_refs_via_curl() + - Don't expect verify_pack() callers to set pack_size - http-push: do not SEGV after fetching a bad pack idx file - http*: copy string returned by sha1_to_hex - http-walker: verify remote packs - http-push, http-walker: style fixes - - t5550-http-fetch: test fetching of packed objects - http-push: fix missing "#ifdef USE_CURL_MULTI" around "is_running_queue" - http-push: send out fetch requests on queue - t5540-http-push: test fetching of packed objects - t5540-http-push: test fetching of loose objects -This is not the re-rolled 18-patch series we discussed yesterday. +Updated (but not yet with the "slot->local = NULL" patch) -* cc/replace (Tue Apr 14 00:36:59 2009 +0200) 13 commits +* cc/replace (Wed May 27 07:14:09 2009 +0200) 14 commits + - t6050: check pushing something based on a replaced commit - Documentation: add documentation for "git replace" - Add git-replace to .gitignore - builtin-replace: use "usage_msg_opt" to give better error messages @@ -376,8 +290,7 @@ This is not the re-rolled 18-patch series we discussed yesterday. "refs/replace/" - refs: add a "for_each_replace_ref" function -I suspect an attempt to replace an object that is directly listed on the -command line would not work very well with this series. +Rebased to master. ---------------------------------------------------------------- [On Hold] -- 2.11.4.GIT