> On 22 Dec 2016, at 23:18, Junio C Hamano <gits...@pobox.com> wrote: > > Here are the topics that have been cooking. Commits prefixed with > '-' are only in 'pu' (proposed updates) while commits prefixed with > '+' are in 'next'. The ones marked with '.' do not appear in any of > the integration branches, but I am still holding onto them. > > Even though I try not to do two "What's cooking" report back to back, > I wanted to push out a few topics that we want to have in 'master' > soonish on 'next' before things really quiet and slow down due to > year-end holidays. > > You can find the changes described here in the integration branches > of the repositories listed at > > http://git-blame.blogspot.com/p/git-public-repositories.html > > Here are the summaries: > > Will merge to 'master'. > + jc/push-default-explicit 10-31/11-01 > #2 > + sb/submodule-config-cleanup 11-22/11-23 > #3 > + va/i18n-perl-scripts 12-14/12-19 > #16 > + cp/merge-continue 12-15/12-19 > #4 > + bw/transport-protocol-policy 12-15/12-19 > #6 > + ls/filter-process 12-18/12-19 > #2 > + ld/p4-compare-dir-vs-symlink 12-18/12-20 > #1 > + jk/difftool-in-subdir 12-11/12-21 > #4 > + sb/submodule-embed-gitdir 12-12/12-21 > #6 > + gv/p4-multi-path-commit-fix 12-19/12-21 > #1 > + mk/mingw-winansi-ttyname-termination-fix 12-20/12-21 > #1 > + lt/shortlog-by-committer 12-20/12-21 > #3 > + va/i18n-even-more 12-20/12-22 > #1 > + ls/p4-lfs 12-20/12-22 > #1 > + js/mingw-isatty 12-22/12-22 > #3 > + bw/realpath-wo-chdir 12-22/12-22 > #5 > + bw/grep-recurse-submodules 12-22/12-22 > #7 > > Will merge to 'next'. > - jc/git-open-cloexec 11-02 > #3 > - ls/p4-path-encoding 12-18 > #1
Please hold it. Luke [1] made a good point and I need some time to think it through. [1] http://public-inbox.org/git/CAE5ih7-=bd_zol5pfyfd2qvy-xe24v_cgge0xoavuotk02e...@mail.gmail.com/ -- Unrelated to my topic: "next" seems to generate a small error on macOS. Probably introduced in "worktree: check if a submodule uses worktrees" (1a248cf) worktree.c:423:9: error: variable 'ret' is used uninitialized whenever 'while' loop exits because its condition is false [-Werror,-Wsometimes-uninitialized] while ((d = readdir(dir)) != NULL) { ^~~~~~~~~~~~~~~~~~~~~~~~~~ worktree.c:431:9: note: uninitialized use occurs here return ret; ^~~ worktree.c:423:9: note: remove the condition if it is always true while ((d = readdir(dir)) != NULL) { ^~~~~~~~~~~~~~~~~~~~~~~~~~ 1 worktree.c:390:9: note: initialize the variable 'ret' to silence this warning int ret; ^ = 0 1 error generated. More: https://s3.amazonaws.com/archive.travis-ci.org/jobs/186186597/log.txt - Lars
