From 44c56ca98750a8b0a4f3de20155d4ef8f2f2a96d Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 31 Jul 2017 15:29:27 -0700 Subject: [PATCH] What's cooking (2017/07 #09) --- whats-cooking.txt | 196 ++++++++++++++++++++++++---------------------- 1 file changed, 104 insertions(+), 92 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 611eed6561..2c90fc23d3 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Jul 2017, #08; Thu, 27) -X-master-at: 5800c63717ae35286a1441f14ffff753e01f7e2b -X-next-at: d1ce394fe289eaefa273394076e591331beea529 +Subject: What's cooking in git.git (Jul 2017, #09; Mon, 31) +X-master-at: e2d9c46130247dd31d0421d2b2fc4bfd014c085e +X-next-at: c4a70dcba25ee98fc8ee2906dbd251ddf5551c27 -What's cooking in git.git (Jul 2017, #08; Thu, 27) +What's cooking in git.git (Jul 2017, #09; Mon, 31) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,14 +12,110 @@ Here are the topics that have been cooking. 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 -rc2 was scheduled for today, I'll wait for a few days +so that we can tag with updated l10n; there isn't much change since +the first release candidate. + 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 +-------------------------------------------------- +[Graduated to "master"] + +* js/blame-lib (2017-07-24) 1 commit + (merged to 'next' on 2017-07-26 at db0d081012) + + blame: fix memory corruption scrambling revision name in error message + + A hotfix to a topic already in 'master'. + -------------------------------------------------- [New Topics] +* as/diff-options-grammofix (2017-07-31) 1 commit + - diff-options doc: grammar fix + + A grammofix. + +-------------------------------------------------- +[Stalled] + +* mg/status-in-progress-info (2017-05-10) 2 commits + - status --short --inprogress: spell it as --in-progress + - status: show in-progress info for short status + + "git status" learns an option to report various operations + (e.g. "merging") that the user is in the middle of. + + cf. + + +* nd/worktree-move (2017-04-20) 6 commits + - worktree remove: new command + - worktree move: refuse to move worktrees with submodules + - worktree move: accept destination as directory + - worktree move: new command + - worktree.c: add update_worktree_location() + - worktree.c: add validate_worktree() + + "git worktree" learned move and remove subcommands. + + Expecting a reroll. + cf. <20170420101024.7593-1-pclouds@gmail.com> + cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net> + cf. + + +* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits + - Documentation/clone: document ignored configuration variables + - clone: respect additional configured fetch refspecs during initial fetch + (this branch is used by sg/remote-no-string-refspecs.) + + "git clone -c var=val" is a way to set configuration variables in + the resulting repository, but it is more useful to also make these + variables take effect while the initial clone is happening, + e.g. these configuration variables could be fetch refspecs. + + Waiting for a response. + cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net> + cf. + + +* js/rebase-i-final (2017-07-27) 10 commits + - rebase -i: rearrange fixup/squash lines using the rebase--helper + - t3415: test fixup with wrapped oneline + - rebase -i: skip unnecessary picks using the rebase--helper + - rebase -i: check for missing commits in the rebase--helper + - t3404: relax rebase.missingCommitsCheck tests + - rebase -i: also expand/collapse the SHA-1s via the rebase--helper + - rebase -i: do not invent onelines when expanding/collapsing SHA-1s + - rebase -i: remove useless indentation + - rebase -i: generate the script via rebase--helper + - t3415: verify that an empty instructionFormat is handled as before + + The final batch to "git rebase -i" updates to move more code from + the shell script to C. + + Expecting a reroll. + + +* bp/fsmonitor (2017-06-12) 6 commits + - fsmonitor: add a sample query-fsmonitor hook script for Watchman + - fsmonitor: add documentation for the fsmonitor extension. + - fsmonitor: add test cases for fsmonitor extension + - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files. + - dir: make lookup_untracked() available outside of dir.c + - bswap: add 64 bit endianness helper get_be64 + + We learned to talk to watchman to speed up "git status". + + Expecting a reroll. + cf. + +-------------------------------------------------- +[Cooking] + * ah/doc-wserrorhighlight (2017-07-25) 1 commit (merged to 'next' on 2017-07-27 at cd1bb28d95) + doc: add missing values "none" and "default" for diff.wsErrorHighlight @@ -82,7 +178,8 @@ of the repositories listed at Expecting a reroll for compilation fix. -* sb/submodule-recursive-checkout-detach-head (2017-07-25) 1 commit +* sb/submodule-recursive-checkout-detach-head (2017-07-28) 2 commits + - Documentation/checkout: clarify submodule HEADs to be detached - recursive submodules: detach HEAD from new state "git checkout --recursive" may overwrite and rewind the history of @@ -103,7 +200,8 @@ of the repositories listed at library can link to it instead of using the copy we ship as part of our source tree. - Will cook in 'next'. + Waiting for review to conclude + cf. * bw/submodule-config-cleanup (2017-07-26) 17 commits @@ -168,83 +266,6 @@ of the repositories listed at Will merge to and cook in 'next'. --------------------------------------------------- -[Stalled] - -* mg/status-in-progress-info (2017-05-10) 2 commits - - status --short --inprogress: spell it as --in-progress - - status: show in-progress info for short status - - "git status" learns an option to report various operations - (e.g. "merging") that the user is in the middle of. - - cf. - - -* nd/worktree-move (2017-04-20) 6 commits - - worktree remove: new command - - worktree move: refuse to move worktrees with submodules - - worktree move: accept destination as directory - - worktree move: new command - - worktree.c: add update_worktree_location() - - worktree.c: add validate_worktree() - - "git worktree" learned move and remove subcommands. - - Expecting a reroll. - cf. <20170420101024.7593-1-pclouds@gmail.com> - cf. <20170421145916.mknekgqzhxffu7di@sigill.intra.peff.net> - cf. - - -* sg/clone-refspec-from-command-line-config (2017-06-16) 2 commits - - Documentation/clone: document ignored configuration variables - - clone: respect additional configured fetch refspecs during initial fetch - (this branch is used by sg/remote-no-string-refspecs.) - - "git clone -c var=val" is a way to set configuration variables in - the resulting repository, but it is more useful to also make these - variables take effect while the initial clone is happening, - e.g. these configuration variables could be fetch refspecs. - - Waiting for a response. - cf. <20170617112228.vugswym4o4owf6wj@sigill.intra.peff.net> - cf. - - -* js/rebase-i-final (2017-07-27) 10 commits - - rebase -i: rearrange fixup/squash lines using the rebase--helper - - t3415: test fixup with wrapped oneline - - rebase -i: skip unnecessary picks using the rebase--helper - - rebase -i: check for missing commits in the rebase--helper - - t3404: relax rebase.missingCommitsCheck tests - - rebase -i: also expand/collapse the SHA-1s via the rebase--helper - - rebase -i: do not invent onelines when expanding/collapsing SHA-1s - - rebase -i: remove useless indentation - - rebase -i: generate the script via rebase--helper - - t3415: verify that an empty instructionFormat is handled as before - - The final batch to "git rebase -i" updates to move more code from - the shell script to C. - - Expecting a reroll. - - -* bp/fsmonitor (2017-06-12) 6 commits - - fsmonitor: add a sample query-fsmonitor hook script for Watchman - - fsmonitor: add documentation for the fsmonitor extension. - - fsmonitor: add test cases for fsmonitor extension - - fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files. - - dir: make lookup_untracked() available outside of dir.c - - bswap: add 64 bit endianness helper get_be64 - - We learned to talk to watchman to speed up "git status". - - Expecting a reroll. - cf. - --------------------------------------------------- -[Cooking] * js/run-process-parallel-api-fix (2017-07-21) 1 commit (merged to 'next' on 2017-07-27 at 4b54b69172) @@ -264,15 +285,6 @@ of the repositories listed at Will cook in 'next'. -* js/blame-lib (2017-07-24) 1 commit - (merged to 'next' on 2017-07-26 at db0d081012) - + blame: fix memory corruption scrambling revision name in error message - - A hotfix to a topic already in 'master'. - - Will merge to 'master'. - - * bw/push-options-recursively-to-submodules (2017-07-20) 1 commit (merged to 'next' on 2017-07-27 at 26b3af2544) + submodule--helper: teach push-check to handle HEAD -- 2.47.3