From: Junio C Hamano Date: Sun, 9 Dec 2018 05:02:51 +0000 (+0900) Subject: What's cooking (2018/12 #01) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b2cc3488ba006e3ba171e85dffbe6f332f84bf9a;p=thirdparty%2Fgit.git What's cooking (2018/12 #01) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 2f997178c6..78dc2c7296 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 (Nov 2018, #07; Fri, 30) -X-master-at: 7068cbc4abac53d9c3675dfba81c1e97d25e8eeb -X-next-at: a9faaff8c120bf4783cb892c157871fe524b3608 +Subject: What's cooking in git.git (Dec 2018, #01; Sun, 9) +X-master-at: 5d826e972970a784bd7a7bdf587512510097b8c7 +X-next-at: bc1bbc6f855c3b5ef7fcbd0f688f647c4e5b208b -What's cooking in git.git (Nov 2018, #07; Fri, 30) +What's cooking in git.git (Dec 2018, #01; Sun, 9) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,44 +12,20 @@ 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. -The road to the upcoming 2.20 turned out to be a bit rockier as we -had a couple of subcommands with larger importance (rebase and -rebase-i) reimplemented, together with some new and exciting -commands (like range-diff and its integration into format-patch), -each with a few loose ends we needed to tie until the last minute. -I've let -rc1 and -rc2 slip for a few days to make sure we get -closer to a stable point, and I am hoping that a few topics that are -at the bottom of master..pu chain with today's pushout merged to the -'master' branch, I should be able to cut a 2.20-rc2 that is in a -reasonable shape. - 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 -------------------------------------------------- -[New Topics] - -* gh/diff-raw-has-no-ellipses (2018-11-26) 1 commit - (merged to 'next' on 2018-11-29 at 24a7536f15) - + doc: update diff-format.txt for removed ellipses in --raw - - "git diff --raw" lost ellipses to adjust the output columns for - some time now, but the documentation still showed them. - - Will cook in 'next'. - - -* mk/http-backend-kill-children-before-exit (2018-11-26) 1 commit - (merged to 'next' on 2018-11-29 at bf2d45062f) - + http-backend: enable cleaning up forked upload/receive-pack on exit +[Graduated to "master"] - The http-backend CGI process did not correctly clean up the child - processes it spawns to run upload-pack etc. when it dies itself, - which has been corrected. +* ab/push-example-in-doc (2018-11-14) 1 commit + (merged to 'next' on 2018-11-18 at 8fd935a19c) + + push: change needlessly ambiguous example in error - Will cook in 'next'. + An error message that sugggests how to give correct arguments to + "git push" has been updated. * ab/replace-graft-with-replace-advice (2018-11-29) 1 commit @@ -62,38 +38,13 @@ of the repositories listed at way the message suggests to use, was running, which made little sense. - Will merge to 'master'. - - -* ma/reset-doc-rendering-fix (2018-11-29) 2 commits - (merged to 'next' on 2018-11-30 at be718c19e2) - + git-reset.txt: render literal examples as monospace - + git-reset.txt: render tables correctly under Asciidoctor - Doc updates. - - Will merge to 'master'. - - -* sg/daemon-test-signal-fix (2018-11-27) 1 commit - (merged to 'next' on 2018-11-30 at b3f7fdf727) - + t/lib-git-daemon: fix signal checking - - Test fix. - - Will merge to 'master'. - - -* tb/log-G-binary (2018-11-29) 1 commit - - log -G: ignore binary files - - "git log -G" looked for a hunk in the "git log -p" patch - output that contained a string that matches the given pattern. - Optimize this code to ignore binary files, which by default will - not show any hunk that would match any pattern (unless textconv or - the --text option is in effect, that is). +* gh/diff-raw-has-no-ellipses (2018-11-26) 1 commit + (merged to 'next' on 2018-11-29 at 24a7536f15) + + doc: update diff-format.txt for removed ellipses in --raw - Expecting an update to the tests. + "git diff --raw" lost ellipses to adjust the output columns for + some time now, but the documentation still showed them. * jc/format-patch-range-diff-fix (2018-11-30) 1 commit @@ -107,8 +58,6 @@ of the repositories listed at corrected by forcing a non-customizable default formatting options on the range-diff machinery when driven by format-patch. - Will merge to 'master'. - * js/rebase-reflog-action-fix (2018-11-30) 1 commit (merged to 'next' on 2018-11-30 at 93fd2fb920) @@ -119,8 +68,6 @@ of the repositories listed at entries it leaves with "rebase -i", but the new version always marks them with "rebase"). This has been corrected. - Will merge to 'master'. - * js/rebase-stat-unrelated-fix (2018-11-30) 1 commit (merged to 'next' on 2018-11-30 at a9faaff8c1) @@ -132,102 +79,176 @@ of the repositories listed at die with an error message, as the original logic was not prepared to cope with this case. This has now been fixed. - Will merge to 'master'. + +* ma/reset-doc-rendering-fix (2018-11-29) 2 commits + (merged to 'next' on 2018-11-30 at be718c19e2) + + git-reset.txt: render literal examples as monospace + + git-reset.txt: render tables correctly under Asciidoctor + + Doc updates. + + +* rt/rebase-in-c-message-fix (2018-12-01) 1 commit + (merged to 'next' on 2018-12-01 at 4428c15a66) + + builtin/rebase.c: remove superfluous space in messages + + +* sg/daemon-test-signal-fix (2018-11-27) 1 commit + (merged to 'next' on 2018-11-30 at b3f7fdf727) + + t/lib-git-daemon: fix signal checking + + Test fix. + + +* sg/test-BUG (2018-11-20) 1 commit + (merged to 'next' on 2018-11-21 at bb81013952) + + tests: send "bug in the test script" errors to the script's stderr + + test framework has been updated to make a bug in the test script + (as opposed to bugs in Git that are discovered by running the + tests) stand out more prominently. + + +* sg/test-cmp-rev (2018-11-20) 1 commit + (merged to 'next' on 2018-11-21 at 5d65cb2a76) + + test-lib-functions: make 'test_cmp_rev' more informative on failure + + Test framework update. + + +* ss/msvc-strcasecmp (2018-11-20) 1 commit + (merged to 'next' on 2018-11-21 at 9e45649e6e) + + msvc: directly use MS version (_stricmp) of strcasecmp + + MSVC update. -------------------------------------------------- -[Graduated to "master"] +[New Topics] + +* cb/openbsd-allows-reading-directory (2018-12-03) 1 commit + - config.mak.uname: OpenBSD uses BSD semantics with fread for directories + + BSD port update. + + Will merge to 'next'. + + +* cb/t5004-empty-tar-archive-fix (2018-12-03) 1 commit + - t5004: avoid using tar for empty packages + + BSD port update. + + Will merge to 'next'. + + +* cb/test-lint-cp-a (2018-12-03) 1 commit + - tests: add lint for non portable cp -a + + BSD port update. + + Will merge to 'next'. + -* cc/delta-islands (2018-11-21) 3 commits - (merged to 'next' on 2018-11-21 at 3bac399f83) - + pack-objects: fix off-by-one in delta-island tree-depth computation - + pack-objects: zero-initialize tree_depth/layer arrays - + pack-objects: fix tree_depth and layer invariants +* hb/t0061-dot-in-path-fix (2018-12-03) 1 commit + - t0061: do not fail test if '.' is part of $PATH - A few issues in the implementation of "delta-islands" feature has + Test update. + + Will merge to 'next'. + + +* hn/highlight-sideband-keywords (2018-12-04) 1 commit + - sideband: color lines with keyword only + + Lines that begin with a certain keyword that come over the wire, as + well as lines that consist only of one of these keywords, ought to + be painted in color for easier eyeballing, but the latter was + broken ever since the feature was introduced in 2.19, which has been corrected. + Will merge to 'next'. + + +* js/commit-graph-chunk-table-fix (2018-12-09) 4 commits + - SQUASH??? + - Makefile: correct example fuzz build + - commit-graph: fix buffer read-overflow + - commit-graph, fuzz: add fuzzer for commit-graph + + The codepath to read from the commit-graph file attempted to read + past the end of it when the file's table-of-contents was corrupt. + + +* jt/get-reference-with-commit-graph (2018-12-06) 1 commit + - revision: use commit graph in get_reference() + (this branch uses sb/more-repo-in-api.) + + Micro-optimize the code that prepares commit objects to be walked + by "git rev-list" when the commit-graph is available. + + Will merge to 'next'. + -* cc/shared-index-permbits (2018-11-19) 1 commit - (merged to 'next' on 2018-11-19 at 79df716844) - + read-cache: make the split index obey umask settings +* md/exclude-promisor-objects-fix-cleanup (2018-12-06) 1 commit + - revision.c: put promisor option in specialized struct - The way .git/index and .git/sharedindex* files were initially - created gave these files different perm bits until they were - adjusted for shared repository settings. This was made consistent. + Code clean-up. + Will merge to 'next'. -* jk/t5562-perl-path-fix (2018-11-24) 1 commit - (merged to 'next' on 2018-11-24 at 2d8dca3544) - + t5562: fix perl path - Hotfix for test breakage on platforms whose Perl is not at - /usr/bin/perl +* bw/mailmap (2018-12-09) 1 commit + - mailmap: update Brandon Williams's email address + Will merge to 'next'. -* jn/eoie-ieot (2018-11-21) 3 commits - (merged to 'next' on 2018-11-21 at 9eb98a38f0) - + index: make index.threads=true enable ieot and eoie - + ieot: default to not writing IEOT section - + eoie: default to not writing EOIE section - (this branch is used by jn/unknown-index-extensions.) - As the warning message shown by existing versions of Git for - unknown index extensions is a bit too alarming, two new extensions - are held back and not written by default for the upcoming release. +* do/gitweb-strict-export-conf-doc (2018-12-09) 1 commit + - docs: fix $strict_export text in gitweb.conf.txt + Doc update. -* js/builtin-rebase-perf-fix-err-fix (2018-11-21) 1 commit - (merged to 'next' on 2018-11-21 at 9c351cfc4a) - + rebase: warn about the correct tree's OID + Will merge to 'next'. - The object name of the tree reported in a recently added error - message was wrong, which has been corrected. +* en/directory-renames-nothanks-doc-update (2018-12-09) 1 commit + - git-rebase.txt: update note about directory rename detection and am -* js/rebase-am-options-fix (2018-11-21) 1 commit - (merged to 'next' on 2018-11-21 at 4da85e17c2) - + legacy-rebase: backport -C and --whitespace=