diff --git a/whats-cooking.txt b/whats-cooking.txt index 18a06c8d28..b977e9db4d 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, #03; Wed, 11) -X-master-at: e47eec8fc6efb5ad0574b4862fd8e8e82b6a62fa -X-next-at: b2e4c32e13df1b7f18e7b4a9f746650471a3122e +Subject: What's cooking in git.git (Mar 2009, #04; Sat, 14) +X-master-at: bba2a7b22fdde7a214516e93d957a950571a2026 +X-next-at: 333522ea3cea320f865fda2140ad362fbf46932f -What's cooking in git.git (Mar 2009, #03; Wed, 11) +What's cooking in git.git (Mar 2009, #04; Sat, 14) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -17,154 +17,38 @@ meant to be merged to the maintenance series have "maint-" in their names. ---------------------------------------------------------------- [New Topics] -* db/maint-missing-origin (Wed Mar 11 01:47:20 2009 -0400) 1 commit - - Give error when no remote is configured +* bw/autoconf (Thu Mar 12 15:20:12 2009 -0400) 7 commits + - configure: rework pthread handling to allow for user defined flags + - configure: make iconv tests aware of user arguments + - configure: asciidoc version test cleanup + - configure: wrap some library tests with GIT_STASH_FLAGS + - configure: add macros to stash FLAG variables + - configure: reorganize flow of argument checks + - configure: ensure settings from user are also usable in the script -* js/sideband-stderr (Tue Mar 10 22:58:09 2009 +0100) 2 commits - - winansi: support ESC [ K (erase in line) - - recv_sideband: Bands #2 and #3 always go to stderr +Looked quite expertly done but I do not use autoconf myself, so I'd merge +this to 'next' soon and see anybody screams. -* js/rsync-local (Mon Mar 9 19:44:55 2009 +0100) 1 commit - - rsync transport: allow local paths, and fix tests +* jc/maint-1.6.0-read-tree-overlay (Thu Mar 12 00:02:12 2009 -0700) 1 commit + - read-tree A B C: do not create a bogus index and do not segfault -* rs/color-grep (Sun Mar 8 18:22:44 2009 -0700) 6 commits - + grep: cast printf %.*s "precision" argument explicitly to int - + grep: add support for coloring with external greps - + grep: color patterns in output - + grep: add pmatch and eflags arguments to match_one_pattern() - + grep: remove grep_opt argument from match_expr_eval() - + grep: micro-optimize hit collection for AND nodes +* fg/push-default (Wed Mar 11 23:01:45 2009 +0100) 1 commit + - New config push.default to decide default behavior for push -* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits - + Support '*' in the middle of a refspec - + Keep '*' in pattern refspecs - + Use the matching function to generate the match results - + Use a single function to match names against patterns - + Make clone parse the default refspec with the normal code +Replaced the old series with the first step to allow a smooth transition. +Some might argue that this should not give any warning but just give users +this new configuration to play with first, and after we know we are going +to switch default some day, start the warning. -* 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 +* ps/blame (Thu Mar 12 21:30:03 2009 +1100) 1 commit + - blame.c: start libifying the blame infrastructure -* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit - + Adjust js/remote-improvements and db/refspec-wildcard-in-the- - middle - -* fg/push-default (Mon Mar 9 23:35:51 2009 +0100) 7 commits - - git push: Remove warning for "git push" default change - - git push: Change default for "git push" to nothing. - - git push: Document that "nothing" is the future push default - - git push: Display warning on unconfigured default push - - git push: New options --matching and --current - - New config option push.default - - remote: Make "-" an alias for the current remote - -With the topmost three patches, tonight's 'pu' does not pass the self test -as expected. I am not sure there is a wide support for changing the -default, either. - -* kg/http-auth (Mon Mar 9 23:34:25 2009 -0700) 3 commits - - http authentication via prompts - - http_init(): Fix config file parsing - - http.c: style cleanups - -This only deals with the fetch side. - -* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit - - Allow --date=local --date=other-format to work as expected - -The one I posted had a few corner-case bugs that was caught with the test -suite; this one has them fixed. +* jc/attributes-checkout (Fri Mar 13 21:24:08 2009 -0700) 1 commit + - Read attributes from the index that is being checked out ---------------------------------------------------------------- [Graduated to "master"] -* jk/sane-relative-time (Tue Feb 24 00:42:16 2009 -0500) 1 commit - + never fallback relative times to absolute - -* js/send-email (Mon Mar 2 23:52:18 2009 -0500) 5 commits - + send-email: add --confirm option and configuration setting - + send-email: don't create temporary compose file until it is needed - + send-email: --suppress-cc improvements - + send-email: handle multiple Cc addresses when reading mbox message - + send-email: allow send-email to run outside a repo - -* sg/rerere-cleanup (Sat Feb 14 23:21:04 2009 +0100) 1 commit - + rerere: remove duplicated functions - -* jc/add-p-unquote (Mon Feb 16 22:43:43 2009 -0800) 1 commit - + git-add -i/-p: learn to unwrap C-quoted paths - -* jw/imap-preformatted-html (Thu Feb 12 08:58:12 2009 -0600) 1 commit - + imap.preformattedHTML to tell Thunderbird to send non-flowed text - -* jw/format-patch-attach (Thu Feb 12 09:51:55 2009 -0600) 1 commit - + Enable setting attach as the default in .gitconfig for git-format- - patch. - -* sr/force-rebase (Fri Feb 13 23:48:01 2009 +0100) 1 commit - + Teach rebase to rebase even if upstream is up to date - -* fg/exclude-bq (Tue Feb 10 15:20:17 2009 +0100) 1 commit - + Support "\" in non-wildcard exclusion entries - -* dm/add-i-edit-abort (Thu Feb 12 00:19:41 2009 -0500) 1 commit - + add -i: revisit hunk on editor failure - -* tp/completion (Sat Feb 21 15:48:43 2009 +0100) 6 commits - + Fixup: Add bare repository indicator for __git_ps1 - + Add bare repository indicator for __git_ps1 - + completion: More fixes to prevent unbound variable errors - + completion: Better __git_ps1 support when not in working directory - + completion: Use consistent if [...] convention, not "test" - + completion: For consistency, change "git rev-parse" to __gitdir - calls - -* js/branch-symref (Wed Feb 18 22:34:44 2009 -0500) 4 commits - + add basic branch display tests - + branch: clean up repeated strlen - + Avoid segfault with 'git branch' when the HEAD is detached - + builtin-branch: improve output when displaying remote branches - -* al/ansi-color (Fri Feb 13 22:53:41 2009 +0100) 2 commits - + builtin-branch.c: Rename branch category color names - + Clean up use of ANSI color sequences - -* js/valgrind (Thu Feb 5 22:03:00 2009 +0100) 9 commits - + valgrind: do not require valgrind 3.4.0 or newer - + test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH - + Tests: let --valgrind imply --verbose and --tee - + Add a script to coalesce the valgrind outputs - + t/Makefile: provide a 'valgrind' target - + test-lib.sh: optionally output to test-results/$TEST.out, too - + Valgrind support: check for more than just programming errors - + valgrind: ignore ldso and more libz errors - + Add valgrind support in test scripts - -* fc/config-editor (Sat Feb 21 02:48:54 2009 +0200) 3 commits - + git config: trivial cleanup for editor action - + git config: codestyle cleanups - + config: Add new option to open an editor. - -* jc/blame (Wed Jun 4 22:58:40 2008 -0700) 2 commits - + blame: show "previous" information in --porcelain/--incremental - format - + git-blame: refactor code to emit "porcelain format" output - -* ns/pretty-format (Tue Feb 24 15:33:29 2009 +0200) 5 commits - + bash completion: add --format= and --oneline options for "git log" - + Add tests for git log --pretty, --format and --oneline. - + Add --oneline that is a synonym to "--pretty=oneline --abbrev- - commit" - + Give short-hands to --pretty=tformat:%formatstring - + Add --format that is a synonym to --pretty - -* en/maint-hash-object (Sat Feb 28 12:56:49 2009 -0700) 1 commit - + Ensure proper setup of git_dir for git-hash-object - ----------------------------------------------------------------- -[Will merge to 'master' soon] - * mg/maint-submodule-normalize-path (Tue Mar 3 16:08:21 2009 +0100) 2 commits + git submodule: Fix adding of submodules at paths with ./, .. and // @@ -213,9 +97,92 @@ This is in response to Linus's "Really slow 'git gc'" ($gmane/110743) + format-patch: track several references + format-patch: threading test reactivation +---------------------------------------------------------------- +[Will merge to 'master' soon] + +* kb/checkout-optim (Sun Mar 8 17:22:51 2009 -0400) 18 commits + + Makefile: Set compiler switch for USE_NSEC + + Create USE_ST_TIMESPEC and turn it on for Darwin + + Not all systems use st_[cm]tim field for ns resolution file + timestamp + + Record ns-timestamps if possible, but do not use it without + USE_NSEC + + write_index(): update index_state->timestamp after flushing to + disk + + verify_uptodate(): add ce_uptodate(ce) test + + make USE_NSEC work as expected + + fix compile error when USE_NSEC is defined + + check_updates(): effective removal of cache entries marked + CE_REMOVE + + lstat_cache(): print a warning if doing ping-pong between cache + types + + show_patch_diff(): remove a call to fstat() + + write_entry(): use fstat() instead of lstat() when file is open + + write_entry(): cleanup of some duplicated code + + create_directories(): remove some memcpy() and strchr() calls + + unlink_entry(): introduce schedule_dir_for_removal() + + lstat_cache(): swap func(length, string) into func(string, length) + + lstat_cache(): generalise longest_match_lstat_cache() + + lstat_cache(): small cleanup and optimisation + +Kjetil has another fix-up patch for ctime/mtime gotcha that is not on this +list but after that is applied this series can go to 'master'. + +* tr/maint-1.6.0-send-email-irt (Wed Mar 11 23:40:13 2009 +0100) 2 commits + + send-email: test --no-thread --in-reply-to combination + + send-email: respect in-reply-to regardless of threading + +* js/remote-improvements (Sun Mar 8 00:10:33 2009 -0800) 23 commits + + builtin-remote.c: no "commented out" code, please + + builtin-remote: new show output style for push refspecs + + builtin-remote: new show output style + + remote: make guess_remote_head() use exact HEAD lookup if it is + available + + builtin-remote: add set-head subcommand + + builtin-remote: teach show to display remote HEAD + + builtin-remote: fix two inconsistencies in the output of "show + " + + builtin-remote: make get_remote_ref_states() always populate + states.tracked + + builtin-remote: rename variables and eliminate redundant function + call + + builtin-remote: remove unused code in get_ref_states + + builtin-remote: refactor duplicated cleanup code + + string-list: new for_each_string_list() function + + remote: make match_refs() not short-circuit + + remote: make match_refs() copy src ref before assigning to + peer_ref + + remote: let guess_remote_head() optionally return all matches + + remote: make copy_ref() perform a deep copy + + remote: simplify guess_remote_head() + + move locate_head() to remote.c + + move duplicated ref_newer() to remote.c + + move duplicated get_local_heads() to remote.c + + refactor find_ref_by_name() to accept const list + + add basic http clone/fetch tests + + test scripts: refactor start_httpd helper + +---------------------------------------------------------------- +[Discarded] + +* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits + . git commit: pathspec without -i/-o implies -i semantics during a + merge + . builtin-commit: shorten eye-sore overlong lines + . Add "partial commit" tests during a conflicted merge + +This was only meant as a weatherballoon to help facilitate discussion. + ---------------------------------------------------------------- [Stalled and may need help and prodding to go forward] +* jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit + - Allow --date=local --date=other-format to work as expected + +The one I posted had a few corner-case bugs that was caught with the test +suite; this one has them fixed. People did not like the UI so it is kept +out of 'next' + * lh/submodule-tree-traversal (Sun Jan 25 01:52:06 2009 +0100) 1 commit - archive.c: add support for --submodules[=(all|checkedout)] @@ -264,32 +231,54 @@ the other end is a native git repository is a very worthy goal. "refs/replace/" - refs: add a "for_each_replace_ref" function -I think the code is much cleaner than the first round, but I am not -convinced it is doing the right thing in the connectivity traverser. -Independent review sorely needed. - ----------------------------------------------------------------- -[Discarded] - -* sc/gitweb-category (Fri Dec 12 00:45:12 2008 +0100) 3 commits - . gitweb: Optional grouping of projects by category - . gitweb: Split git_project_list_body in two functions - . gitweb: Modularized git_get_project_description to be more generic - -Design discussion between Jakub and Sebastien seems to have stalled, but -Jakub seems to be taking this over. - -* jc/push-to-create (Mon Mar 2 22:36:16 2009 -0800) 1 commit - . Push to create - -This was a failed weatherbaloon patch to allow creation of a new -repository from the remote side. - ---------------------------------------------------------------- [Actively cooking] +* mg/http-auth (Thu Mar 12 22:34:43 2009 -0700) 4 commits + + 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 + +This does only the fetch side but without any additional configuration +variables that looked like band-aid. + +* db/maint-missing-origin (Wed Mar 11 01:47:20 2009 -0400) 1 commit + + Give error when no remote is configured + +* js/sideband-stderr (Tue Mar 10 22:58:09 2009 +0100) 2 commits + + winansi: support ESC [ K (erase in line) + + recv_sideband: Bands #2 and #3 always go to stderr + +* js/rsync-local (Mon Mar 9 19:44:55 2009 +0100) 1 commit + + rsync transport: allow local paths, and fix tests + +* rs/color-grep (Sun Mar 8 18:22:44 2009 -0700) 6 commits + + grep: cast printf %.*s "precision" argument explicitly to int + + grep: add support for coloring with external greps + + grep: color patterns in output + + grep: add pmatch and eflags arguments to match_one_pattern() + + grep: remove grep_opt argument from match_expr_eval() + + grep: micro-optimize hit collection for AND nodes + +* db/refspec-wildcard-in-the-middle (Sat Mar 7 01:11:39 2009 -0500) 5 commits + + Support '*' in the middle of a refspec + + Keep '*' in pattern refspecs + + Use the matching function to generate the match results + + Use a single function to match names against patterns + + Make clone parse the default refspec with the normal code + +* 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 + +* xx/db-refspec-vs-js-remote (Sun Mar 8 00:12:33 2009 -0800) 1 commit + + Adjust js/remote-improvements and db/refspec-wildcard-in-the- + middle + * hv/cvsimport-tests (Mon Mar 2 18:59:36 2009 +0100) 1 commit - - cvsimport: add test illustrating a bug in cvsps + + cvsimport: add test illustrating a bug in cvsps Yet more tests without fixing anything... @@ -313,31 +302,6 @@ branch. But I do not feel very strongly about it. * js/rebase-i-opt (Tue Mar 3 10:55:31 2009 +0100) 1 commit + rebase -i: avoid 'git reset' when possible -* kb/checkout-optim (Sun Mar 8 17:22:51 2009 -0400) 18 commits - + Makefile: Set compiler switch for USE_NSEC - + Create USE_ST_TIMESPEC and turn it on for Darwin - + Not all systems use st_[cm]tim field for ns resolution file - timestamp - + Record ns-timestamps if possible, but do not use it without - USE_NSEC - + write_index(): update index_state->timestamp after flushing to - disk - + verify_uptodate(): add ce_uptodate(ce) test - + make USE_NSEC work as expected - + fix compile error when USE_NSEC is defined - + check_updates(): effective removal of cache entries marked - CE_REMOVE - + lstat_cache(): print a warning if doing ping-pong between cache - types - + show_patch_diff(): remove a call to fstat() - + write_entry(): use fstat() instead of lstat() when file is open - + write_entry(): cleanup of some duplicated code - + create_directories(): remove some memcpy() and strchr() calls - + unlink_entry(): introduce schedule_dir_for_removal() - + lstat_cache(): swap func(length, string) into func(string, length) - + lstat_cache(): generalise longest_match_lstat_cache() - + lstat_cache(): small cleanup and optimisation - * mv/parseopt-ls-files (Sat Mar 7 20:27:22 2009 -0500) 4 commits + ls-files: fix broken --no-empty-directory + t3000: use test_cmp instead of diff @@ -347,36 +311,6 @@ branch. But I do not feel very strongly about it. The tip one was a subject for further discussion, but nothing is queued yet. -* js/remote-improvements (Sun Mar 8 00:10:33 2009 -0800) 23 commits - + builtin-remote.c: no "commented out" code, please - + builtin-remote: new show output style for push refspecs - + builtin-remote: new show output style - + remote: make guess_remote_head() use exact HEAD lookup if it is - available - + builtin-remote: add set-head subcommand - + builtin-remote: teach show to display remote HEAD - + builtin-remote: fix two inconsistencies in the output of "show - " - + builtin-remote: make get_remote_ref_states() always populate - states.tracked - + builtin-remote: rename variables and eliminate redundant function - call - + builtin-remote: remove unused code in get_ref_states - + builtin-remote: refactor duplicated cleanup code - + string-list: new for_each_string_list() function - + remote: make match_refs() not short-circuit - + remote: make match_refs() copy src ref before assigning to - peer_ref - + remote: let guess_remote_head() optionally return all matches - + remote: make copy_ref() perform a deep copy - + remote: simplify guess_remote_head() - + move locate_head() to remote.c - + move duplicated ref_newer() to remote.c - + move duplicated get_local_heads() to remote.c - + refactor find_ref_by_name() to accept const list - + add basic http clone/fetch tests - + test scripts: refactor start_httpd helper - * fc/parseopt-config (Sat Mar 7 12:14:05 2009 -0500) 9 commits + config: set help text for --bool-or-int + git config: don't allow --get-color* and variable type @@ -389,19 +323,14 @@ yet. + git_config(): not having a per-repo config file is not an error * mh/cvsimport-tests (Mon Feb 23 06:08:14 2009 +0100) 5 commits - - 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 Tests without fixes are of dubious value. Any takers? -* tr/maint-1.6.0-send-email-irt (Sun Mar 1 23:45:41 2009 +0100) 1 commit - + send-email: respect in-reply-to regardless of threading - -Tests? - * 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/ @@ -419,7 +348,8 @@ Tests? - Introduce commit notes Rebased and then kicked back to 'pu' to give the author a chance to -rearrange if necessary. +rearrange if necessary. Nothing happened yet, but I see Dscho has been +busy on msysgit side of the world, so it is understandable. ---------------------------------------------------------------- [On Hold] @@ -433,12 +363,3 @@ rearrange if necessary. These are for 1.7.0, but the messages when they trigger together may need to be rethought. - -* jc/commit-assume-also-during-merge (Thu Jan 22 22:21:49 2009 -0800) 3 commits - - git commit: pathspec without -i/-o implies -i semantics during a - merge - - builtin-commit: shorten eye-sore overlong lines - - Add "partial commit" tests during a conflicted merge - -This was only meant as a weatherballoon to help facilitate discussion. -Will be discarded.