diff --git a/whats-cooking.txt b/whats-cooking.txt index 6f974e5808..cbd1ed0507 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,143 +1,109 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2009, #01; Mon, 06) -X-master-at: f581de1b7b9d17c83b188bf8ffe536fb8a9dd2a4 -X-next-at: 8586bb07b181c75e65a39d88128e40a1c3e88e2c +Subject: What's cooking in git.git (Jul 2009, #02; Sun, 26) +X-master-at: d8f7be2ebcb7e3ec40269080a9ab9a28bc06ba17 +X-next-at: 2b05f9bd0a9944bbaab9f24d305932a57e4735d4 -What's cooking in git.git (Jul 2009, #01; Mon, 06) +What's cooking in git.git (Jul 2009, #02; Sun, 26) -------------------------------------------------- -Here are the topics that have been cooking. Commits prefixed with '-' are -only in 'pu' while commits prefixed with '+' are in 'next'. The ones -marked with '.' do not appear in any of the branches, but I am still -holding onto them. +These topics in 'next' (ones prefixed with '+') and 'pu' (ones prefixed +with '.') will not be in 1.6.4 final, and are subject to be rewound once +it happens. -The topics list the commits in reverse chronological order. The topics -meant to be merged to the maintenance series have "maint-" in their names. - -It has been relatively quiet for the past few weeks. The 'next' branch is -getting quite thin, and it would be a good time to declare -rc0. I'll do -so by my Wednesday. +We have quite a few solid topics in 'next', so hopefully the next cycle +would be shorter than usual. I'd propose to call it 1.6.5, and then make +the one after that 1.7.0, which means that during the 1.6.5 cycle, 'next' +will have the two incompatible "push" (actually, receive-pack) changes +hitherto kept on hold in 'pu'. ---------------------------------------------------------------- [New Topics] -* ld/push-porcelain-output-format (Mon Jun 22 21:10:01 2009 -0400) 1 commit - + add --porcelain option to git-push +* jk/show-tag (Sat Jul 18 06:14:37 2009 -0400) 2 commits + + show: add space between multiple items + + show: suppress extra newline when showing annotated tag -* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 7 commits - - receive-pack: remove unnecessary run_status report - - run_command: report failure to execute the program, but optionally - don't - - run_command: encode deadly signal number in the return value - - run_command: report system call errors instead of returning error - codes - - run_command: return exit code as positive value - - MinGW: simplify waitpid() emulation macros - - MinGW: truncate exit()'s argument to lowest 8 bits +Didn't look bad at all, but is not pressing either. -A few replacement/squash updates came in before it hit 'pu'; this should -be the latest version. +* sb/parse-options (Tue Jul 7 22:15:41 2009 -0700) 4 commits + + prune-packed: migrate to parse-options + + verify-pack: migrate to parse-options + + verify-tag: migrate to parse-options + + write-tree: migrate to parse-options -* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits - - rebase -i: use "git sequencer--helper --make-patch" - - sequencer: free memory used in "make_patch" function - - sequencer: add "make_patch" function to save a patch - - sequencer: add "builtin-sequencer--helper.c" +* mk/grep-max-depth (Wed Jul 22 19:52:15 2009 +0200) 1 commit + + grep: Add --max-depth option. -* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit - - mailinfo: Remove only one set of square brackets +* jn/gitweb-blame (Sat Jul 25 00:44:10 2009 +0200) 10 commits + - gitweb: Create links leading to 'blame_incremental' using + JavaScript + - gitweb: Incremental blame (proof of concept) + - gitweb: Add optional "time to generate page" info in footer + - gitweb: Add -partial_query option to href() subroutine + - gitweb: Use light/dark for class names also in 'blame' view + - gitweb: Add author initials in 'blame' view, a la "git gui blame" + - gitweb: Mark commits with no "previous" in 'blame' view + - gitweb: Use "previous" header of git-blame -p in 'blame' view + - gitweb: Mark boundary commits in 'blame' view + - gitweb: Make .error style generic -The change needed to the test vector shows the extent of the damage this -change may cause in the real world. A handcrafted "Subject: [area] [PATCH] title" -will be turned into "[PATCH] title". +Still in flux/rfc. -* rs/grep-p (Thu Jul 2 00:06:34 2009 +0200) 7 commits - + grep: simplify -p output - + grep -p: support user defined regular expressions - + grep: add option -p/--show-function - + grep: handle pre context lines on demand - + grep: print context hunk marks between files - + grep: move context hunk mark handling into show_line() - + userdiff: add xdiff_clear_find_func() +* ns/init-mkdir (Sat Jul 25 06:59:28 2009 +0900) 1 commit + + git init: optionally allow a directory argument ----------------------------------------------------------------- -[Graduated to "master"] +Didn't look bad, but is not pressing either. -* cf/maint-remote-uploadpack-useconfig-fix (Thu Jun 25 17:21:35 2009 -0400) 1 commit - + git-remote: fix missing .uploadpack usage for show command +* jc/apply-epoch-patch (Fri Jul 10 18:38:08 2009 -0700) 1 commit + + apply: notice creation/removal patches produced by GNU diff -* sb/show-ref-parse-options (Sat Jun 20 21:40:46 2009 -0700) 1 commit - + show-ref: migrate to parse-options +* sb/pull-rebase (Sun Jul 19 09:45:16 2009 +0200) 2 commits + + pull: support rebased upstream + fetch + pull --rebase + + t5520-pull: Test for rebased upstream + fetch + pull --rebase -* ne/maint-1.6.0-diff-tree-t-r-show-directory (Sat Jun 13 17:06:09 2009 -0700) 1 commit - + diff-tree -r -t: include added/removed directories in the output +* db/transport-shim (Sat Jul 25 13:51:40 2009 -0400) 3 commits + - git-http-fetch: not a builtin + - Use an external program to implement fetching with curl + - Add support for external programs for handling native fetches -This changes the output from "diff-tree -r -t"; it brings more consistency -to it, but it is a change and could break scripts. +Interesting as a concept. I saw its ls-remote segfault on me, though. +Hopefully will mature by 1.6.5 final. -* uk/rev-parse-parse-opt (Sun Jun 14 01:58:43 2009 +0200) 2 commits - + parse-opt: make PARSE_OPT_STOP_AT_NON_OPTION available to git rev- - parse - + more tests for git rev-parse --parse-opt +* pb/tracking (Thu Jul 16 16:26:15 2009 -0500) 7 commits + + branch.c: if remote is not config'd for branch, don't try delete + push config + + branch, checkout: introduce autosetuppush + + move deletion of merge configuration to branch.c + + remote: add per-remote autosetupmerge and autosetuprebase + configuration + + introduce a struct tracking_config + + branch: install_branch_config and struct tracking refactoring + + config: allow false and true values for branch.autosetuprebase -* js/daemon-log (Sun Jun 21 23:16:09 2009 +0200) 3 commits - + receive-pack: do not send error details to the client - + upload-pack: squelch progress indicator if client cannot see it - + daemon: send stderr of service programs to the syslog +After some discussion, I suspect we may want to rewind this out of 'next' +and start over with a fresh design. -* sb/quiet-porcelains (Wed Jun 17 18:07:37 2009 -0700) 6 commits - + stash: teach quiet option - + am, rebase: teach quiet option - + submodule, repack: migrate to git-sh-setup's say() - + git-sh-setup: introduce say() for quiet options - + am: suppress apply errors when using 3-way - + t4150: test applying with a newline in subject +* mk/init-db-parse-options (Sun Jul 12 12:24:32 2009 +0200) 1 commit + + init-db: migrate to parse-options -* jk/use-our-regexp (Fri Jun 19 10:10:39 2009 -0500) 3 commits - + Makefile: Solaris needs HAVE_ALLOCA_H for alloca() - + Makefile: use compat regex on Solaris - + Makefile: refactor regex compat support +* tr/reset-checkout-patch (Sat Jul 25 23:29:34 2009 +0200) 5 commits + - Implement 'git stash save --patch' + - Implement 'git checkout --patch' + - Implement 'git reset --patch' + - builtin-add: refactor the meat of interactive_add() + - git-apply--interactive: Refactor patch mode code -* cb/maint-fetch-refspec-wo-dst (Wed Jun 17 15:38:36 2009 +0200) 1 commit - - fetch: do not create ref from empty name - -* cc/bisect (Sat Jun 13 13:11:02 2009 +0200) 2 commits - + Documentation: remove warning saying that "git bisect skip" may - slow bisection - + bisect: use a PRNG with a bias when skipping away from untestable - commits - -* tr/die_errno (Sat Jun 27 17:58:47 2009 +0200) 4 commits - - Use die_errno() instead of die() when checking syscalls - - Convert existing die(..., strerror(errno)) to die_errno() - - die_errno(): double % in strerror() output just in case - - Introduce die_errno() that appends strerror(errno) to die() - -I didn't check the individual conversion from die() to die_errno() -in this latest round; comments? - -* 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 - -Will be in 'next' shortly. +Still in flux/rfc. ---------------------------------------------------------------- [Stalled and may need help and prodding to go forward] -* ml/http (Wed May 27 23:16:03 2009 -0400) 2 commits - - http.c: add http.sslCertPasswordProtected option - - http.c: prompt for SSL client certificate password +* gp/maint-rebase-p-onto (Wed Jul 22 12:38:58 2009 -0400) 1 commit + . Fix rebase -p --onto -I've rewritten these two to (1) move the #ifdef out of the main codepath, -and (2) use configuration/environment to make the misfeature of always -asking for a passphrase even a key/cert is unencrypted optional. I tried -to be careful but extra sets of eyeballs would be nice to check the result. - -Nobody seems to be jumping up-and-down asking for this or helping to push -this forward. Perhaps it's time to drop it? +I'd say we should take this even if it means Dscho needs his rebase -p +rewrite. It is not very pressing, so perhaps do so immediately after +1.6.4 final. * jh/notes (Sat May 16 13:44:17 2009 +0200) 5 commits - Teach "-m " and "-F " to "git notes edit" @@ -149,15 +115,7 @@ this forward. Perhaps it's time to drop it? Dscho asked about the performance implications of this; I do not think I saw any progress on that yet... -* 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 - conversion - - Add 'fill_directory()' helper function for directory traversal - -Before adding the real "conversion", this needs a few real fixups, I -think. For example there is one hardcoded array that is used without -bounds check. +Will drop after 1.6.4 unless any further progress is seen. * ar/maint-1.6.2-merge-recursive-d-f (Mon May 11 21:25:36 2009 +0200) 2 commits - Fix for a merge where a branch has an F->D transition @@ -172,6 +130,8 @@ may be long overdue but seems to be a hard problem. A few minor point remains in this initial one. +Will drop after 1.6.4 unless any further progress is seen. + * jc/log-tz (Tue Mar 3 00:45:37 2009 -0800) 1 commit - Allow --date=local --date=other-format to work as expected @@ -179,6 +139,8 @@ 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' +Will drop after 1.6.4 unless any further progress is seen. + * jc/merge-convert (Mon Jan 26 16:45:01 2009 -0800) 1 commit - git-merge-file: allow converting the results for the work tree @@ -199,11 +161,16 @@ canonical representation and possibly add conflict markers, and then write the results out after convert_to_working_tree(). It also needs to write in binary mode as well. +Will drop after 1.6.4 unless any further progress is seen. + * db/foreign-scm (Tue Mar 24 23:04:12 2009 -0400) 3 commits - Add option for using a foreign VCS - Document details of transport function APIs - Allow late reporting of fetched hashes +I have a feeling that the recent transport-shim series from the same +author could supersede this one. + * 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 @@ -216,72 +183,74 @@ in binary mode as well. - Start a library for cvsimport-related tests ---------------------------------------------------------------- -[Actively cooking] +[Not actively cooking] -* gb/gitweb-avatar (Tue Jun 30 00:00:54 2009 +0200) 7 commits - - gitweb: add empty alt text to avatar img - - gitweb: picon avatar provider - - gitweb: gravatar url cache - - gitweb: (gr)avatar support - - gitweb: use git_print_authorship_rows in 'tag' view too - - gitweb: uniform author info for commit and commitdiff - - gitweb: refactor author name insertion +* js/run-command-updates (Sat Jul 4 21:26:43 2009 +0200) 6 commits + + receive-pack: remove unnecessary run_status report + + run_command: report failure to execute the program, but optionally + don't + + run_command: encode deadly signal number in the return value + + run_command: report system call errors instead of returning error + codes + + run_command: return exit code as positive value + + MinGW: simplify waitpid() emulation macros -This should be the latest one posted to the list, and I think it is -reasonable, and Jakub seemed to concur. Will be in 'next' +Will merge after 1.6.4 + +* cc/sequencer-rebase-i (Fri Jun 26 23:08:46 2009 +0200) 4 commits + - rebase -i: use "git sequencer--helper --make-patch" + - sequencer: free memory used in "make_patch" function + - sequencer: add "make_patch" function to save a patch + - sequencer: add "builtin-sequencer--helper.c" * en/fast-export (Thu Jun 25 22:48:33 2009 -0600) 7 commits - - fast-export: Document the fact that git-rev-list arguments are + + fast-export: Document the fact that git-rev-list arguments are accepted - - Add new fast-export testcases - - fast-export: Add a --tag-of-filtered-object option for newly + + Add new fast-export testcases + + fast-export: Add a --tag-of-filtered-object option for newly dangling tags - - fast-export: Do parent rewriting to avoid dropping relevant + + fast-export: Do parent rewriting to avoid dropping relevant commits - - fast-export: Make sure we show actual ref names instead of + + fast-export: Make sure we show actual ref names instead of "(null)" - - fast-export: Omit tags that tag trees - - fast-export: Set revs.topo_order before calling setup_revisions + + fast-export: Omit tags that tag trees + + fast-export: Set revs.topo_order before calling setup_revisions Shawn? Dscho? * 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 + + diff: Rename QUIET internal option to QUICK + + diff: change semantics of "ignore whitespace" options -I am not sure if it should wait for a major version bump but this is a -good semantics change. Perhaps merge to 'next' soonish, but I am -undecided. Comments? - -For the following three series, I have not managed to convince myself if -these changes have real-world needs. +Possibly merge during 1.6.5, or 1.7.0 since this is a semantics change. * sb/read-tree (Thu Jun 25 22:14:10 2009 -0700) 2 commits - - read-tree: migrate to parse-options - - read-tree: convert unhelpful usage()'s to helpful die()'s + + read-tree: migrate to parse-options + + read-tree: convert unhelpful usage()'s to helpful die()'s + +Will merge after 1.6.4 * ne/futz-upload-pack (Wed Jun 10 01:50:18 2009 +0200) 1 commit - - Shift object enumeration out of upload-pack + + Shift object enumeration out of upload-pack + +Will merge after 1.6.4 * 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 - - 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 + + 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 + + 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 - ----------------------------------------------------------------- -[On Hold] + + refs: add a "for_each_replace_ref" function * jc/deny-delete-current-1.7.0 (Mon Feb 9 00:19:46 2009 -0800) 1 commit - receive-pack: default receive.denyDeleteCurrent to refuse @@ -291,4 +260,19 @@ these changes have real-world needs. push These are for 1.7.0, but the messages when they trigger together may need -to be rethought. +to be rethought. Will be kept in 'next' during 1.6.5 cycle. + +---------------------------------------------------------------- +[Dropped] + +* ae/maint-mailinfo-rm-only-one-patch-marker (Mon Jun 29 11:55:51 2009 +0200) 1 commit + - mailinfo: Remove only one set of square brackets + +* 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 + conversion + . Add 'fill_directory()' helper function for directory traversal + +It appears that we may want to settle with a MacOS X specific conversion, +if somebody really cares enough.