diff --git a/whats-cooking.txt b/whats-cooking.txt index a0fb7dc6f6..8251f3351b 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 (Dec 2010, #03; Fri, 10) -X-master-at: 4443091d961e91041e64c1675940f0585eeba456 -X-next-at: 018bc80d140aff02f61e3a5100dd1367311d38ff +Subject: What's cooking in git.git (Dec 2010, #04; Mon, 13) +X-master-at: b5c178143088350c49129acbedb864d70c666215 +X-next-at: 7dc56dda544e82bf53b1f2c717157a78f946c464 -What's cooking in git.git (Dec 2010, #03; Fri, 10) +What's cooking in git.git (Dec 2010, #04; Mon, 13) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are @@ -14,36 +14,124 @@ still holding onto them. -------------------------------------------------- [New Topics] -* jh/gitweb-caching-8 (2010-12-09) 18 commits - . gitweb: Add better error handling for gitweb caching - . gitweb: Prepare for cached error pages & better error page handling - . gitweb: When changing output (STDOUT) change STDERR as well - . gitweb: Add show_warning() to display an immediate warning, with refresh - . gitweb: add print_transient_header() function for central header printing - . gitweb: Add commented url & url hash to page footer - . gitweb: Change file handles (in caching) to lexical variables as opposed to globs - . gitweb: add isDumbClient() check - . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type - . gitweb: Revert reset_output() back to original code - . gitweb: Change is_cacheable() to return true always - . gitweb: Revert back to $cache_enable vs. $caching_enabled - . gitweb: Add more explicit means of disabling 'Generating...' page - . gitweb: Regression fix concerning binary output of files - . gitweb: Minimal testing of gitweb caching - . gitweb: File based caching layer (from git.kernel.org) - . gitweb: add output buffering and associated functions - . gitweb: Prepare for splitting gitweb +* nd/oneline-sha1-name-from-specific-ref (2010-12-13) 3 commits + - get_sha1: support $commit^{/regex} syntax + - get_sha1_oneline: make callers prepare the commit list to traverse + - get_sha1_oneline: fix lifespan rule of temp_commit_buffer variable -It appears that John and Jakub are finally working together to help -producing something that we can ship in-tree, finally. I am looking -forward to seeing the conclusion of the discussion. +-------------------------------------------------- +[Graduated to "master"] -* rj/msvc-fix (2010-12-04) 4 commits - (merged to 'next' on 2010-12-10 at 7a2c2c6) - + msvc: Fix macro redefinition warnings - + msvc: Fix build by adding missing INTMAX_MAX define - + msvc: git-daemon.exe: Fix linker "unresolved externals" error - + msvc: Fix compilation errors in compat/win32/sys/poll.c +* ef/help-cmd-prefix (2010-11-26) 1 commit + (merged to 'next' on 2010-12-08 at c92752e) + + help: always suggest common-cmds if prefix of cmd + +* ef/win32-dirent (2010-11-23) 6 commits + (merged to 'next' on 2010-12-08 at 1a7169d) + + win32: use our own dirent.h + + msvc: opendir: handle paths ending with a slash + + win32: dirent: handle errors + + msvc: opendir: do not start the search + + msvc: opendir: allocate enough memory + + msvc: opendir: fix malloc-failure + +* gb/web--browse (2010-12-03) 4 commits + (merged to 'next' on 2010-12-08 at cff4009) + + web--browse: better support for chromium + + web--browse: support opera, seamonkey and elinks + + web--browse: split valid_tool list + + web--browse: coding style + +The remainder of the series, which is mostly Debian specific addition, can +wait (or just left for the distro). + +* ja/maint-pull-rebase-doc (2010-12-03) 1 commit + (merged to 'next' on 2010-12-08 at 211bf89) + + git-pull.txt: Mention branch.autosetuprebase + +* jk/asciidoc-update (2010-11-19) 1 commit + (merged to 'next' on 2010-12-08 at 72ffafe) + + docs: default to more modern toolset + +* jk/maint-reflog-bottom (2010-11-21) 1 commit + (merged to 'next' on 2010-12-08 at f5ca80a) + + reflogs: clear flags properly in corner case + +* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits + (merged to 'next' on 2010-12-08 at 0fc3158) + + update-index -h: show usage even with corrupt index + + merge -h: show usage even with corrupt index + + ls-files -h: show usage even with corrupt index + + gc -h: show usage even with broken configuration + + commit/status -h: show usage even with broken configuration + + checkout-index -h: show usage even in an invalid repository + + branch -h: show usage even in an invalid repository + +* jn/gitweb-per-request-config (2010-11-28) 2 commits + (merged to 'next' on 2010-12-08 at 44be9e5) + + gitweb: document $per_request_config better + + gitweb: selectable configurations that change with each request + +* jn/parse-options-extra (2010-12-01) 10 commits + (merged to 'next' on 2010-12-08 at 3a3e3ac) + + update-index: migrate to parse-options API + + setup: save prefix (original cwd relative to toplevel) in startup_info + + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION + + parse-options: allow git commands to invent new option types + + parse-options: never suppress arghelp if LITERAL_ARGHELP is set + + parse-options: do not infer PARSE_OPT_NOARG from option type + + parse-options: sanity check PARSE_OPT_NOARG flag + + parse-options: move NODASH sanity checks to parse_options_check + + parse-options: clearer reporting of API misuse + + parse-options: Don't call parse_options_check() so much + (this branch is used by nd/extended-sha1-relpath.) + +* js/configurable-tab (2010-11-30) 2 commits + (merged to 'next' on 2010-12-08 at 3257365) + + Make the tab width used for whitespace checks configurable + + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD + (this branch uses js/maint-apply-tab-in-indent-fix.) + +* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit + (merged to 'next' on 2010-12-08 at 02aedd5) + + apply --whitespace=fix: fix tab-in-indent + (this branch is used by js/configurable-tab.) + +* mz/maint-rebase-stat-config (2010-11-09) 1 commit + (merged to 'next' on 2010-12-08 at 97d4912) + + rebase: only show stat if configured to true + +* mz/pull-rebase-rebased (2010-11-13) 1 commit + (merged to 'next' on 2010-12-08 at 99c1762) + + Use reflog in 'pull --rebase . foo' + +* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit + (merged to 'next' on 2010-12-08 at adce2e1) + + rebase --abort: do not update branch ref + +* mz/rebase-i-verify (2010-11-22) 1 commit + (merged to 'next' on 2010-12-08 at 18275df) + + rebase: support --verify + +* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit + (merged to 'next' on 2010-12-08 at 1869996) + + entry.c: remove "checkout-index" from error messages + +* tc/format-patch-p (2010-11-23) 1 commit + (merged to 'next' on 2010-12-08 at e8bff23) + + format-patch: page output with --stdout + +* tc/http-urls-ends-with-slash (2010-11-25) 9 commits + (merged to 'next' on 2010-12-08 at b9a878a) + + http-fetch: rework url handling + + http-push: add trailing slash at arg-parse time, instead of later on + + http-push: check path length before using it + + http-push: Normalise directory names when pushing to some WebDAV servers + + http-backend: use end_url_with_slash() + + url: add str wrapper for end_url_with_slash() + + shift end_url_with_slash() from http.[ch] to url.[ch] + + t5550-http-fetch: add test for http-fetch + + t5550-http-fetch: add missing '&&' -------------------------------------------------- [Stalled] @@ -84,6 +172,13 @@ This unfortunately heavily conflicts with patches in flight... -------------------------------------------------- [Cooking] +* rj/msvc-fix (2010-12-04) 4 commits + (merged to 'next' on 2010-12-10 at 7a2c2c6) + + msvc: Fix macro redefinition warnings + + msvc: Fix build by adding missing INTMAX_MAX define + + msvc: git-daemon.exe: Fix linker "unresolved externals" error + + msvc: Fix compilation errors in compat/win32/sys/poll.c + * ak/describe-exact (2010-12-09) 4 commits (merged to 'next' on 2010-12-10 at 33497db) + describe: Delay looking up commits until searching for an inexact match @@ -97,15 +192,21 @@ Rerolled and looked fine. (merged to 'next' on 2010-12-08 at f821694) + t9119: do not compare "Text Last Updated" line from "svn info" +Will merge to 'master'. + * jn/submodule-b-current (2010-12-05) 2 commits (merged to 'next' on 2010-12-08 at 33423f3) + git submodule: Remove now obsolete tests before cloning a repo + git submodule -b ... of current HEAD fails +Will merge to 'master'. + * jc/maint-no-openssl-build-fix (2010-12-08) 1 commit (merged to 'next' on 2010-12-08 at e348a87) + Do not link with -lcrypto under NO_OPENSSL +Will merge to 'master'. + * aa/status-hilite-branch (2010-12-09) 2 commits (merged to 'next' on 2010-12-10 at d00551d) + default color.status.branch to "same as header" @@ -114,13 +215,9 @@ Rerolled and looked fine. Will merge to 'master'. -* ef/help-cmd-prefix (2010-11-26) 1 commit - (merged to 'next' on 2010-12-08 at c92752e) - + help: always suggest common-cmds if prefix of cmd - -Will merge to 'master'. - -* jn/fast-import-blob-access (2010-12-03) 5 commits +* jn/fast-import-blob-access (2010-12-13) 6 commits + (merged to 'next' on 2010-12-12 at 7dc56dd) + + t9300: avoid short reads from dd (merged to 'next' on 2010-12-08 at a42f0b3) + t9300: remove unnecessary use of /dev/stdin + fast-import: Allow cat-blob requests at arbitrary points in stream @@ -130,13 +227,6 @@ Will merge to 'master'. Will merge to 'master'. -* jn/gitweb-per-request-config (2010-11-28) 2 commits - (merged to 'next' on 2010-12-08 at 44be9e5) - + gitweb: document $per_request_config better - + gitweb: selectable configurations that change with each request - -Will merge to 'master'. - * kb/diff-C-M-synonym (2010-11-10) 2 commits - diff: use "find" instead of "detect" as prefix for long forms of -M and -C - diff: add --detect-copies-harder as a synonym for --find-copies-harder @@ -150,59 +240,11 @@ I was being lazy and said "Ok" to "cvsimport.capital-r" but luckily other people injected sanity to the discussion. Weatherbaloon patch sent, but not queued here. -* mz/maint-rebase-stat-config (2010-11-09) 1 commit - (merged to 'next' on 2010-12-08 at 97d4912) - + rebase: only show stat if configured to true - -Will merge to 'master'. - -* mz/pull-rebase-rebased (2010-11-13) 1 commit - (merged to 'next' on 2010-12-08 at 99c1762) - + Use reflog in 'pull --rebase . foo' - -Will merge to 'master'. - -* nd/maint-hide-checkout-index-from-error (2010-11-28) 1 commit - (merged to 'next' on 2010-12-08 at 1869996) - + entry.c: remove "checkout-index" from error messages - -Will merge to 'master'. - * tf/commit-list-prefix (2010-11-26) 1 commit - commit: Add commit_list prefix in two function names. -* gb/web--browse (2010-12-03) 4 commits - (merged to 'next' on 2010-12-08 at cff4009) - + web--browse: better support for chromium - + web--browse: support opera, seamonkey and elinks - + web--browse: split valid_tool list - + web--browse: coding style - -The remainder of the series, which is mostly Debian specific addition, can -wait (or just left for the distro). - -Will merge to 'master'. - -* ja/maint-pull-rebase-doc (2010-12-03) 1 commit - (merged to 'next' on 2010-12-08 at 211bf89) - + git-pull.txt: Mention branch.autosetuprebase - -Will merge to 'master'. - -* js/configurable-tab (2010-11-30) 2 commits - (merged to 'next' on 2010-12-08 at 3257365) - + Make the tab width used for whitespace checks configurable - + Merge branch 'js/maint-apply-tab-in-indent-fix' into HEAD - (this branch uses js/maint-apply-tab-in-indent-fix.) - -Will merge to 'master'. - -* js/maint-apply-tab-in-indent-fix (2010-11-30) 1 commit - (merged to 'next' on 2010-12-08 at 02aedd5) - + apply --whitespace=fix: fix tab-in-indent - (this branch is used by js/configurable-tab.) - -Will merge to 'master'. +This churn already introduced an unnecessary conflict. It is not by +itself a biggie, but these things tend to add up. * pd/bash-4-completion (2010-12-01) 2 commits - Use the new functions to get the current cword. @@ -211,29 +253,6 @@ Will merge to 'master'. There is a "here is a better way to do this" from Jonathan, but I lost track. -* ef/win32-dirent (2010-11-23) 6 commits - (merged to 'next' on 2010-12-08 at 1a7169d) - + win32: use our own dirent.h - + msvc: opendir: handle paths ending with a slash - + win32: dirent: handle errors - + msvc: opendir: do not start the search - + msvc: opendir: allocate enough memory - + msvc: opendir: fix malloc-failure - -Will merge to 'master'. - -* jk/asciidoc-update (2010-11-19) 1 commit - (merged to 'next' on 2010-12-08 at 72ffafe) - + docs: default to more modern toolset - -Will merge to 'master'. - -* jk/maint-reflog-bottom (2010-11-21) 1 commit - (merged to 'next' on 2010-12-08 at f5ca80a) - + reflogs: clear flags properly in corner case - -Will merge to 'master'. - * jn/fast-import-ondemand-checkpoint (2010-11-22) 1 commit (merged to 'next' on 2010-12-08 at f538396) + fast-import: treat SIGUSR1 as a request to access objects early @@ -278,40 +297,10 @@ Will merge to 'master'. Some RFC patches, to give them early and wider exposure. -* mz/rebase-abort-reflog-fix (2010-11-21) 1 commit - (merged to 'next' on 2010-12-08 at adce2e1) - + rebase --abort: do not update branch ref - -Will merge to 'master'. - -* mz/rebase-i-verify (2010-11-22) 1 commit - (merged to 'next' on 2010-12-08 at 18275df) - + rebase: support --verify - -Will merge to 'master'. - * nd/maint-relative (2010-11-20) 1 commit (merged to 'next' on 2010-12-10 at 018bc80) + get_cwd_relative(): do not misinterpret root path -* tc/format-patch-p (2010-11-23) 1 commit - (merged to 'next' on 2010-12-08 at e8bff23) - + format-patch: page output with --stdout - -Will merge to 'master'. - -* tc/http-urls-ends-with-slash (2010-11-25) 9 commits - (merged to 'next' on 2010-12-08 at b9a878a) - + http-fetch: rework url handling - + http-push: add trailing slash at arg-parse time, instead of later on - + http-push: check path length before using it - + http-push: Normalise directory names when pushing to some WebDAV servers - + http-backend: use end_url_with_slash() - + url: add str wrapper for end_url_with_slash() - + shift end_url_with_slash() from http.[ch] to url.[ch] - + t5550-http-fetch: add test for http-fetch - + t5550-http-fetch: add missing '&&' - Will merge to 'master'. * nd/extended-sha1-relpath (2010-12-09) 3 commits @@ -320,7 +309,8 @@ Will merge to 'master'. (merged to 'next' on 2010-12-08 at 940e5e2) + get_sha1: support relative path ":path" syntax + Make prefix_path() return char* without const - (this branch uses jn/parse-options-extra.) + +Will merge to 'master'. * nd/maint-fix-add-typo-detection (2010-11-27) 5 commits - Revert "excluded_1(): support exclude files in index" @@ -329,9 +319,6 @@ Will merge to 'master'. - dir.c: add free_excludes() - cache.h: realign and use (1 << x) form for CE_* constants -Note that the commit that used to be at the bottom of this series -have been merged to 'master' (it was a no-op fix). - * jh/gitweb-caching (2010-12-03) 4 commits . gitweb: Minimal testing of gitweb caching . gitweb: File based caching layer (from git.kernel.org) @@ -340,21 +327,29 @@ have been merged to 'master' (it was a no-op fix). Previous iteration; dropped. -* jn/parse-options-extra (2010-12-01) 10 commits - (merged to 'next' on 2010-12-08 at 3a3e3ac) - + update-index: migrate to parse-options API - + setup: save prefix (original cwd relative to toplevel) in startup_info - + parse-options: make resuming easier after PARSE_OPT_STOP_AT_NON_OPTION - + parse-options: allow git commands to invent new option types - + parse-options: never suppress arghelp if LITERAL_ARGHELP is set - + parse-options: do not infer PARSE_OPT_NOARG from option type - + parse-options: sanity check PARSE_OPT_NOARG flag - + parse-options: move NODASH sanity checks to parse_options_check - + parse-options: clearer reporting of API misuse - + parse-options: Don't call parse_options_check() so much - (this branch is used by nd/extended-sha1-relpath.) +* jh/gitweb-caching-8 (2010-12-09) 18 commits + . gitweb: Add better error handling for gitweb caching + . gitweb: Prepare for cached error pages & better error page handling + . gitweb: When changing output (STDOUT) change STDERR as well + . gitweb: Add show_warning() to display an immediate warning, with refresh + . gitweb: add print_transient_header() function for central header printing + . gitweb: Add commented url & url hash to page footer + . gitweb: Change file handles (in caching) to lexical variables as opposed to globs + . gitweb: add isDumbClient() check + . gitweb: Adding isBinaryAction() and isFeedAction() to determine the action type + . gitweb: Revert reset_output() back to original code + . gitweb: Change is_cacheable() to return true always + . gitweb: Revert back to $cache_enable vs. $caching_enabled + . gitweb: Add more explicit means of disabling 'Generating...' page + . gitweb: Regression fix concerning binary output of files + . gitweb: Minimal testing of gitweb caching + . gitweb: File based caching layer (from git.kernel.org) + . gitweb: add output buffering and associated functions + . gitweb: Prepare for splitting gitweb -Will merge to 'master'. +It appears that John and Jakub are finally working together to help +producing something that we can ship in-tree, finally. I am looking +forward to seeing the conclusion of the discussion. * nd/setup (2010-11-26) 47 commits - git.txt: correct where --work-tree path is relative to @@ -405,17 +400,7 @@ Will merge to 'master'. - Add t1510 and basic rules that run repo setup - builtins: print setup info if repo is found -* jn/git-cmd-h-bypass-setup (2010-10-22) 7 commits - (merged to 'next' on 2010-12-08 at 0fc3158) - + update-index -h: show usage even with corrupt index - + merge -h: show usage even with corrupt index - + ls-files -h: show usage even with corrupt index - + gc -h: show usage even with broken configuration - + commit/status -h: show usage even with broken configuration - + checkout-index -h: show usage even in an invalid repository - + branch -h: show usage even in an invalid repository - -Will merge to 'master'. +Need to re-read this series to move it forward. * yd/dir-rename (2010-10-29) 5 commits - Allow hiding renames of individual files involved in a directory rename. @@ -462,9 +447,6 @@ Wait Nguyen for another round (2010-11-11). + Add the 'fetch.recurseSubmodules' config setting + fetch/pull: Add the --recurse-submodules option -After giving another look, I think this is Ok, although I didn't quite get -where the magic number 5 in fetch_populated_submodules() came from. - Will merge to 'master'. * tr/merge-unborn-clobber (2010-08-22) 1 commit