diff --git a/whats-cooking.txt b/whats-cooking.txt index c2250c64f9..2696c1ac54 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,23 +1,20 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Nov 2012, #06; Mon, 19) -X-master-at: f3828dc0669826660f5034a468913115675ff501 -X-next-at: 0037290f177c95a7fd401d8dfe453851e0840c9d +Subject: What's cooking in git.git (Nov 2012, #07; Wed, 21) +X-master-at: 2d242fb3fc19fc9ba046accdd9210be8b9913f64 +X-next-at: ce6fbe5b9dc5e1e8ce1499bd8f7fb982e0c68289 -What's cooking in git.git (Nov 2012, #06; Mon, 19) +What's cooking in git.git (Nov 2012, #07; Wed, 21) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. -Bunch of topics have been merged to 'next'. - -We are at the beginning of the 5th week of this release cycle -(cf. http://tinyurl.com/gitcal), and I've moved many topics to the -Stalled category, which will be discarded without prejudice soonish -unless there are some updates. I am still a bit behind on some -topics and already posted rerolls may have to be pulled in. +Many topics have been merged to 'maint' in preparation for 1.8.0.1; +and some more dormant topics have been moved to the stalled category +(to be discarded without prejudice unless they see some activities). +The upcoming 1.8.1 release is slowly taking shape. You can find the changes described here in the integration branches of the repositories listed at @@ -27,11 +24,137 @@ repositories listed at -------------------------------------------------- [New Topics] -* nd/pathspec-wildcard (2012-11-19) 4 commits - - tree_entry_interesting: do basedir compare on wildcard patterns when possible - - pathspec: apply "*.c" optimization from exclude - - pathspec: do exact comparison on the leading non-wildcard part - - pathspec: save the non-wildcard length part +* nd/maint-compat-fnmatch-fix (2012-11-20) 1 commit + (merged to 'next' on 2012-11-21 at ce6fbe5) + + compat/fnmatch: fix off-by-one character class's length check + + Will merge to 'master' and then 'maint'. + +-------------------------------------------------- +[Graduated to "master"] + +* cn/config-missing-path (2012-11-15) 1 commit + (merged to 'next' on 2012-11-18 at c08b73c) + + config: don't segfault when given --path with a missing value + + +* jk/checkout-out-of-unborn (2012-11-15) 1 commit + (merged to 'next' on 2012-11-18 at 7d2aa24) + + checkout: print a message when switching unborn branches + + +* jk/config-ignore-duplicates (2012-10-29) 9 commits + (merged to 'next' on 2012-10-29 at 67fa0a2) + + builtin/config.c: Fix a sparse warning + (merged to 'next' on 2012-10-25 at 233df08) + + git-config: use git_config_with_options + + git-config: do not complain about duplicate entries + + git-config: collect values instead of immediately printing + + git-config: fix regexp memory leaks on error conditions + + git-config: remove memory leak of key regexp + + t1300: test "git config --get-all" more thoroughly + + t1300: remove redundant test + + t1300: style updates + + Drop duplicate detection from git-config; this lets it better match + the internal config callbacks, which clears up some corner cases + with includes. This is an API breakage, though. + + +* jk/maint-gitweb-xss (2012-11-12) 1 commit + (merged to 'next' on 2012-11-14 at 7a667bc) + + gitweb: escape html in rss title + + Fixes an XSS vulnerability in gitweb. + + +* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits + (merged to 'next' on 2012-11-09 at af69926) + + remote-curl: retry failed requests for auth even with gzip + + remote-curl: hoist gzip buffer size to top of post_rpc + + Fixes fetch from servers that ask for auth only during the actual + packing phase. This is not really a recommended configuration, but it + cleans up the code at the same time. + + +* jl/submodule-rm (2012-11-14) 1 commit + (merged to 'next' on 2012-11-18 at bf4525d) + + docs: move submodule section + + Documentation correction for d21240f (Merge branch + 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked. + + +* kb/preload-index-more (2012-11-02) 1 commit + (merged to 'next' on 2012-11-09 at a750ebd) + + update-index/diff-index: use core.preloadindex to improve performance + + Use preloadindex in more places, which has a nice speedup on systems + with slow stat calls (and even on Linux). + + +* mg/replace-resolve-delete (2012-11-13) 1 commit + (merged to 'next' on 2012-11-14 at fa785ae) + + replace: parse revision argument for -d + + Be more user friendly to people using "git replace -d". + + +* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits + (merged to 'next' on 2012-11-13 at 2bf41d9) + + link_alt_odb_entries(): take (char *, len) rather than two pointers + + link_alt_odb_entries(): use string_list_split_in_place() + + Cleanups in the alternates code. Fixes a potential bug and makes the + code much cleaner. + + +* ml/cygwin-mingw-headers (2012-11-18) 2 commits + (merged to 'next' on 2012-11-19 at f9964da) + + USE CGYWIN_V15_WIN32API as macro to select api for cygwin + (merged to 'next' on 2012-11-15 at 22e11b3) + + Update cygwin.c for new mingw-64 win32 api headers + + Make git work on newer cygwin. + + +* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit + (merged to 'next' on 2012-11-13 at e90cc7c) + + git p4: RCS expansion should not span newlines + + I do not have p4 to play with, but looks obviously correct to me. + + +* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit + (merged to 'next' on 2012-11-13 at c57d856) + + gitweb.perl: fix %highlight_ext mappings + + Fixes a clever misuse of perl's list interpretation. + + +* so/prompt-command (2012-10-17) 4 commits + (merged to 'next' on 2012-10-25 at 79565a1) + + coloured git-prompt: paint detached HEAD marker in red + + Fix up colored git-prompt + + show color hints based on state of the git tree + + Allow __git_ps1 to be used in PROMPT_COMMAND + + Updates __git_ps1 so that it can be used as $PROMPT_COMMAND, + instead of being used for command substitution in $PS1, to embed + color escape sequences in its output. + + Will merge to 'master' in the seventh batch. + + +* ta/doc-cleanup (2012-10-25) 6 commits + (merged to 'next' on 2012-11-13 at e11fafd) + + Documentation: build html for all files in technical and howto + + Documentation/howto: convert plain text files to asciidoc + + Documentation/technical: convert plain text files to asciidoc + + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt + + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1 + + Split over-long synopsis in git-fetch-pack.txt into several lines -------------------------------------------------- [Stalled] @@ -55,18 +178,6 @@ repositories listed at Expecting a re-roll. -* pp/gitweb-config-underscore (2012-11-08) 1 commit - - gitweb: make remote_heads config setting work - - The key "gitweb.remote_heads" is not legal git config; this maps it to - "gitweb.remoteheads". - - Junio raised a good point about the implementation for three-level - variables. - - Expecting a re-roll. - - * mo/cvs-server-updates (2012-10-16) 10 commits - cvsserver Documentation: new cvs ... -r support - cvsserver: add t9402 to test branch and tag refs @@ -82,16 +193,6 @@ repositories listed at Needs review by folks interested in cvsserver. -* jc/apply-trailing-blank-removal (2012-10-12) 1 commit - - apply.c:update_pre_post_images(): the preimage can be truncated - - Fix to update_pre_post_images() that did not take into account the - possibility that whitespace fix could shrink the preimage and - change the number of lines in it. - - Extra set of eyeballs appreciated. - - * jn/warn-on-inaccessible-loosen (2012-10-14) 4 commits - config: exit on error accessing any config file - doc: advertise GIT_CONFIG_NOSYSTEM @@ -152,7 +253,7 @@ repositories listed at * fc/remote-testgit-feature-done (2012-10-29) 1 commit - remote-testgit: properly check for errors - Is this still in "Needs review" state? Are poeple involved in the + Is this still in "Needs review" state? Are people involved in the remote interface happy with this change? @@ -327,14 +428,54 @@ repositories listed at -------------------------------------------------- [Cooking] -* jl/submodule-rm (2012-11-14) 1 commit - (merged to 'next' on 2012-11-18 at bf4525d) - + docs: move submodule section +* fc/fast-export-fixes (2012-11-21) 19 commits + - fast-export: don't handle uninteresting refs + - fast-export: make sure updated refs get updated + - fast-export: fix comparison in tests + - fast-export: trivial cleanup + - remote-testgit: advertise "done" feature and write "done" ourselves + - fixup! remote-testgit: report success after an import + - remote-testgit: report success after an import + - fixup! remote-testgit: exercise non-default refspec feature + - remote-testgit: exercise non-default refspec feature + - remote-testgit: cleanup tests + - remote-testgit: remove irrelevant test + - remote-testgit: remove non-local tests + - fixup! Add git-remote-testgit + - Add git-remote-testgit + - Rename git-remote-testgit to git-remote-testpy + - remote-helpers: fix failure message + - remote-testgit: fix direction of marks + - fixup! fast-export: avoid importing blob marks + - fast-export: avoid importing blob marks - Documentation correction for d21240f (Merge branch - 'jl/submodule-rm', 2012-10-29) that needs to be fast-tracked. + Replaced with the last re-roll posted to the list, queued with + various fixup! commits to record suggested changes (most are + trivial style fixes). - Will merge to 'master' in the sixth batch. + +* pp/gitweb-config-underscore (2012-11-21) 1 commit + - gitweb: make remote_heads config setting work + + The key "gitweb.remote_heads" is not legal git config; this maps it to + "gitweb.remoteheads". + + +* jc/apply-trailing-blank-removal (2012-10-12) 1 commit + - apply.c:update_pre_post_images(): the preimage can be truncated + + Fix to update_pre_post_images() that did not take into account the + possibility that whitespace fix could shrink the preimage and + change the number of lines in it. + + Will merge to 'next'. + + +* nd/pathspec-wildcard (2012-11-19) 4 commits + - tree_entry_interesting: do basedir compare on wildcard patterns when possible + - pathspec: apply "*.c" optimization from exclude + - pathspec: do exact comparison on the leading non-wildcard part + - pathspec: save the non-wildcard length part * sg/complete-help-undup (2012-11-14) 1 commit @@ -351,20 +492,6 @@ repositories listed at Will merge to 'master' in the seventh batch. -* cn/config-missing-path (2012-11-15) 1 commit - (merged to 'next' on 2012-11-18 at c08b73c) - + config: don't segfault when given --path with a missing value - - Will merge to 'master' in the sixth batch. - - -* jk/checkout-out-of-unborn (2012-11-15) 1 commit - (merged to 'next' on 2012-11-18 at 7d2aa24) - + checkout: print a message when switching unborn branches - - Will merge to 'master' in the sixth batch. - - * mk/complete-tcsh (2012-11-16) 1 commit (merged to 'next' on 2012-11-19 at 8309029) + tcsh-completion re-using git-completion.bash @@ -378,47 +505,6 @@ repositories listed at Will merge to 'next'. -* jk/maint-gitweb-xss (2012-11-12) 1 commit - (merged to 'next' on 2012-11-14 at 7a667bc) - + gitweb: escape html in rss title - - Fixes an XSS vulnerability in gitweb. - - Will merge to 'master' in the sixth batch. - - -* mg/replace-resolve-delete (2012-11-13) 1 commit - (merged to 'next' on 2012-11-14 at fa785ae) - + replace: parse revision argument for -d - - Be more user friendly to people using "git replace -d". - - Will merge to 'master' in the sixth batch. - - -* ml/cygwin-mingw-headers (2012-11-18) 2 commits - (merged to 'next' on 2012-11-19 at f9964da) - + USE CGYWIN_V15_WIN32API as macro to select api for cygwin - (merged to 'next' on 2012-11-15 at 22e11b3) - + Update cygwin.c for new mingw-64 win32 api headers - - Make git work on newer cygwin. - - Will merge to 'master' in the sixth batch. - - -* ta/doc-cleanup (2012-10-25) 6 commits - (merged to 'next' on 2012-11-13 at e11fafd) - + Documentation: build html for all files in technical and howto - + Documentation/howto: convert plain text files to asciidoc - + Documentation/technical: convert plain text files to asciidoc - + Change headline of technical/send-pack-pipeline.txt to not confuse its content with content from git-send-pack.txt - + Shorten two over-long lines in git-bisect-lk2009.txt by abbreviating some sha1 - + Split over-long synopsis in git-fetch-pack.txt into several lines - - Will merge to 'master' in the sixth batch. - - * lt/diff-stat-show-0-lines (2012-10-17) 1 commit (merged to 'next' on 2012-11-19 at 0037290) + Fix "git diff --stat" for interesting - but empty - file changes @@ -438,21 +524,9 @@ repositories listed at Any comments from zsh users? -* so/prompt-command (2012-10-17) 4 commits - (merged to 'next' on 2012-10-25 at 79565a1) - + coloured git-prompt: paint detached HEAD marker in red - + Fix up colored git-prompt - + show color hints based on state of the git tree - + Allow __git_ps1 to be used in PROMPT_COMMAND - - Updates __git_ps1 so that it can be used as $PROMPT_COMMAND, - instead of being used for command substitution in $PS1, to embed - color escape sequences in its output. - - Will cook in 'next'. - - -* nd/wildmatch (2012-10-15) 13 commits +* nd/wildmatch (2012-11-20) 14 commits + (merged to 'next' on 2012-11-21 at 151288f) + + test-wildmatch: avoid Windows path mangling (merged to 'next' on 2012-10-25 at 510e8df) + Support "**" wildcard in .gitignore and .gitattributes + wildmatch: make /**/ match zero or more directories @@ -491,26 +565,6 @@ repositories listed at Will merge to 'master' in the seventh batch. -* jk/config-ignore-duplicates (2012-10-29) 9 commits - (merged to 'next' on 2012-10-29 at 67fa0a2) - + builtin/config.c: Fix a sparse warning - (merged to 'next' on 2012-10-25 at 233df08) - + git-config: use git_config_with_options - + git-config: do not complain about duplicate entries - + git-config: collect values instead of immediately printing - + git-config: fix regexp memory leaks on error conditions - + git-config: remove memory leak of key regexp - + t1300: test "git config --get-all" more thoroughly - + t1300: remove redundant test - + t1300: style updates - - Drop duplicate detection from git-config; this lets it - better match the internal config callbacks, which clears up - some corner cases with includes. - - Will merge to 'master' in the sixth batch. - - * fc/completion-test-simplification (2012-11-16) 6 commits - completion: simplify __gitcomp() test helper - completion: refactor __gitcomp related tests @@ -531,8 +585,7 @@ repositories listed at Use textconv filters when searching with "log -S". - It probably should lose "are the textconv on the two sides the - same?" check. + Will merge to 'next'. * fc/remote-bzr (2012-11-08) 5 commits @@ -576,28 +629,6 @@ repositories listed at Will merge to 'master' in the seventh batch. -* jk/maint-http-half-auth-fetch (2012-10-31) 2 commits - (merged to 'next' on 2012-11-09 at af69926) - + remote-curl: retry failed requests for auth even with gzip - + remote-curl: hoist gzip buffer size to top of post_rpc - - Fixes fetch from servers that ask for auth only during the actual - packing phase. This is not really a recommended configuration, but it - cleans up the code at the same time. - - Will merge to 'master' in the sixth batch. - - -* kb/preload-index-more (2012-11-02) 1 commit - (merged to 'next' on 2012-11-09 at a750ebd) - + update-index/diff-index: use core.preloadindex to improve performance - - Use preloadindex in more places, which has a nice speedup on systems - with slow stat calls (and even on Linux). - - Will merge to 'master' in the sixth batch. - - * cr/push-force-tag-update (2012-11-19) 5 commits - push: update remote tags only with force - push: flag updates that require force @@ -608,61 +639,6 @@ repositories listed at Require "-f" for push to update a tag, even if it is a fast-forward. -* fc/fast-export-fixes (2012-11-08) 14 commits - - fast-export: don't handle uninteresting refs - - fast-export: make sure updated refs get updated - - fast-export: fix comparison in tests - - fast-export: trivial cleanup - - remote-testgit: make clear the 'done' feature - - remote-testgit: report success after an import - - remote-testgit: exercise more features - - remote-testgit: cleanup tests - - remote-testgit: remove irrelevant test - - remote-testgit: get rid of non-local functionality - - Add new simplified git-remote-testgit - - Rename git-remote-testgit to git-remote-testpy - - remote-testgit: fix direction of marks - - fast-export: avoid importing blob marks - - Improvements to fix fast-export bugs, including how refs pointing to - already-seen commits are handled. An earlier 4-commit version of this - series looked good to me, but this much-expanded version has not seen - any comments. - - Looks like it has been re-rolled, but I haven't checked it out yet. - - Needs review. - - -* mh/alt-odb-string-list-cleanup (2012-11-08) 2 commits - (merged to 'next' on 2012-11-13 at 2bf41d9) - + link_alt_odb_entries(): take (char *, len) rather than two pointers - + link_alt_odb_entries(): use string_list_split_in_place() - - Cleanups in the alternates code. Fixes a potential bug and makes the - code much cleaner. - - Will merge to 'master' in the sixth batch. - - -* pw/maint-p4-rcs-expansion-newline (2012-11-08) 1 commit - (merged to 'next' on 2012-11-13 at e90cc7c) - + git p4: RCS expansion should not span newlines - - I do not have p4 to play with, but looks obviously correct to me. - - Will merge to 'master' in the sixth batch. - - -* rh/maint-gitweb-highlight-ext (2012-11-08) 1 commit - (merged to 'next' on 2012-11-13 at c57d856) - + gitweb.perl: fix %highlight_ext mappings - - Fixes a clever misuse of perl's list interpretation. - - Will merge to 'master' in the sixth batch. - - * rr/submodule-diff-config (2012-11-18) 4 commits (merged to 'next' on 2012-11-19 at 355319e) + submodule: display summary header in bold