From e19a17b3f3ebbd39b4da35fe6edf96f79522a173 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Wed, 31 Jan 2018 16:55:41 -0800 Subject: [PATCH] What's cooking (2018/01 #04) --- whats-cooking.txt | 666 ++++++++++++++++++++++------------------------ 1 file changed, 320 insertions(+), 346 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 39d7b405e4..a1e0beff9c 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 (Jan 2018, #03; Tue, 23) +Subject: What's cooking in git.git (Jan 2018, #04; Wed, 31) X-master-at: 5be1f00a9a701532232f57958efab4be8c959a29 X-next-at: de0f0111ea2ad3a2b03a378e6272c2ee476a26ed -What's cooking in git.git (Jan 2018, #03; Tue, 23) +What's cooking in git.git (Jan 2018, #04; Wed, 31) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,9 +12,13 @@ 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. -Many topics in 'next' have been merged to 'master' while others are -tentatively kicked back to 'pu', to give them a chance to be rerolled -if the authors of them wish to do so. +Many new topics appeared and are not yet marked with "Will do what" +labels. Except for some large ones, I think most are already in +good shape, but I'd want to double check by re-reading them. + +I am migrating my build and integration environment to a different +machine; if you notice anything out of ordinary, please let me know +before I decomission and reimage my usual environment ;-) You can find the changes described here in the integration branches of the repositories listed at @@ -22,233 +26,355 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] +[New Topics] -* ab/commit-m-with-fixup (2017-12-22) 2 commits - (merged to 'next' on 2018-01-11 at 41255c464f) - + commit: add support for --fixup -m"" - + commit doc: document that -c, -C, -F and --fixup with -m error +* ab/fetch-prune (2018-01-24) 11 commits + - fetch: add a --fetch-prune option and fetch.pruneTags config + - fetch tests: add scaffolding for the new fetch.pruneTags + - git-fetch & config doc: link to the new PRUNING section + - git remote doc: correct dangerous lies about what prune does + - git fetch doc: add a new section to explain the ins & outs of pruning + - fetch tests: test --prune and refspec interaction + - fetch tests: add a tag to be deleted to the pruning tests + - fetch tests: re-arrange arguments for future readability + - fetch tests: refactor in preparation for testing tag pruning + - fetch: stop accessing "remote" variable indirectly + - fetch: don't redundantly NULL something calloc() gave us - "git commit --fixup" did not allow "-m" option to be used - at the same time; allow it to annotate resulting commit with more - text. + Clarify how configured fetch refspecs interact with the "--prune" + option of "git fetch", and also add a handy short-hand for getting + rid of stale tags that are locally held. -* ab/doc-cat-file-e-still-shows-errors (2018-01-10) 1 commit - (merged to 'next' on 2018-01-12 at 080bb1d397) - + cat-file doc: document that -e will return some output +* gs/retire-mru (2018-01-24) 1 commit + - mru: Replace mru.[ch] with list.h implementation + (this branch uses ot/mru-on-list.) - Doc update. + Retire mru API as it does not give enough abstraction over + underlying list API to be worth it. + Will merge to 'next'. -* ab/perf-grep-threads (2018-01-04) 1 commit - (merged to 'next' on 2018-01-09 at 91889574fb) - + perf: amend the grep tests to test grep.threads - More perf tests for threaded grep +* jc/mailinfo-cleanup-fix (2018-01-24) 1 commit + - mailinfo: avoid segfault when can't open files + Corner case bugfix. -* as/read-tree-prefix-doc-fix (2018-01-09) 1 commit - (merged to 'next' on 2018-01-12 at 895c72e5c3) - + doc/read-tree: remove obsolete remark + Will merge to 'next'. - Doc update. +* po/clang-format-functype-weight (2018-01-24) 1 commit + - clang-format: adjust penalty for return type line break -* bw/oidmap-autoinit (2017-12-27) 1 commit - (merged to 'next' on 2018-01-11 at f941e013b4) - + oidmap: ensure map is initialized + Prevent "clang-format" from breaking line after function return type. - Code clean-up. + Will merge to 'next'. -* cc/codespeed (2018-01-05) 7 commits - (merged to 'next' on 2018-01-09 at 8578089a2b) - + perf/run: read GIT_PERF_REPO_NAME from perf.repoName - + perf/run: learn to send output to codespeed server - + perf/run: learn about perf.codespeedOutput - + perf/run: add conf_opts argument to get_var_from_env_or_config() - + perf/aggregate: implement codespeed JSON output - + perf/aggregate: refactor printing results - + perf/aggregate: fix checking ENV{GIT_PERF_SUBSECTION} +* po/http-push-error-message (2018-01-24) 1 commit + - http-push: improve error log - "perf" test output can be sent to codespeed server. + Debugging aid. + Will merge to 'next'. -* dk/describe-all-output-fix (2017-12-27) 1 commit - (merged to 'next' on 2017-12-28 at c6254494e3) - + describe: prepend "tags/" when describing tags with embedded name - An old regression in "git describe --all $annotated_tag^0" has been - fixed. +* po/object-id (2018-01-30) 12 commits + - sha1_file: rename hash_sha1_file_literally + - sha1_file: convert write_loose_object to object_id + - sha1_file: convert force_object_loose to object_id + - sha1_file: convert write_sha1_file to object_id + - notes: convert write_notes_tree to object_id + - notes: convert combine_notes_* to object_id + - commit: convert commit_tree* to object_id + - match-trees: convert splice_tree to object_id + - cache: clear whole hash buffer with oidclr + - sha1_file: convert hash_sha1_file to object_id + - dir: convert struct sha1_stat to use object_id + - sha1_file: convert pretend_sha1_file to object_id + Conversion from uchar[20] to struct object_id continues. -* ew/empty-merge-with-dirty-index (2018-01-09) 1 commit - (merged to 'next' on 2018-01-09 at 6bcda11248) - + Merge branch 'ew/empty-merge-with-dirty-index-maint' into ew/empty-merge-with-dirty-index - (this branch uses ew/empty-merge-with-dirty-index-maint.) - "git merge -s recursive" did not correctly abort when the index is - dirty, if the merged tree happened to be the same as the current - HEAD, which has been fixed. +* sg/travis-linux32-sanity (2018-01-30) 5 commits + - travis-ci: don't fail if user already exists on 32 bit Linux build job + - travis-ci: don't run the test suite as root in the 32 bit Linux build + - travis-ci: don't repeat the path of the cache directory + - travis-ci: use 'set -e' in the 32 bit Linux build job + - travis-ci: use 'set -x' for the commands under 'su' in the 32 bit Linux build + Will merge to 'next'. -* jc/merge-symlink-ours-theirs (2018-01-03) 1 commit - (merged to 'next' on 2018-01-05 at 63ebfc45eb) - + merge: teach -Xours/-Xtheirs to symbolic link merge - "git merge -Xours/-Xtheirs" learned to use our/their version when - resolving a conflicting updates to a symbolic link. +* jk/daemon-fixes (2018-01-25) 6 commits + - daemon: fix length computation in newline stripping + - t/lib-git-daemon: add network-protocol helpers + - daemon: handle NULs in extended attribute string + - daemon: fix off-by-one in logging extended attributes + - t/lib-git-daemon: record daemon log + - t5570: use ls-remote instead of clone for interp tests + + +* jt/long-running-process-doc (2018-01-25) 1 commit + - Docs: split out long-running subprocess handshake + + +* nd/format-patch-stat-width (2018-01-25) 2 commits + - format-patch: reduce patch diffstat width to 72 + - format-patch: keep cover-letter diffstat wrapped in 72 columns + + +* nd/list-merge-strategy (2018-01-26) 1 commit + - completion: fix completing merge strategies on non-C locales + + +* sb/pull-rebase-submodule (2018-01-25) 1 commit + - builtin/pull: respect verbosity settings in submodules + + +* sg/test-i18ngrep (2018-01-26) 10 commits + - t: make 'test_i18ngrep' more informative on failure + - t: make sure that 'test_i18ngrep' got enough parameters + - t: forbid piping into 'test_i18ngrep' + - t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh' + - t5536: let 'test_i18ngrep' read the file without redirection + - t5510: consolidate 'grep' and 'test_i18ngrep' patterns + - t4001: don't run 'git status' upstream of a pipe + - t6022: don't run 'git merge' upstream of a pipe + - t5812: add 'test_i18ngrep's missing filename parameter + - t5541: add 'test_i18ngrep's missing filename parameter + + +* bw/c-plus-plus (2018-01-30) 37 commits + - replace: rename 'new' variables + - trailer: rename 'template' variables + - tempfile: rename 'template' variables + - wrapper: rename 'template' variables + - environment: rename 'namespace' variables + - diff: rename 'template' variables + - environment: rename 'template' variables + - init-db: rename 'template' variables + - unpack-trees: rename 'new' variables + - trailer: rename 'new' variables + - submodule: rename 'new' variables + - split-index: rename 'new' variables + - remote: rename 'new' variables + - ref-filter: rename 'new' variables + - read-cache: rename 'new' variables + - line-log: rename 'new' variables + - imap-send: rename 'new' variables + - http: rename 'new' variables + - entry: rename 'new' variables + - diffcore-delta: rename 'new' variables + - diff: rename 'new' variables + - diff-lib: rename 'new' variable + - commit: rename 'new' variables + - combine-diff: rename 'new' variables + - remote: rename 'new' variables + - reflog: rename 'new' variables + - pack-redundant: rename 'new' variables + - help: rename 'new' variables + - checkout: rename 'new' variables + - apply: rename 'new' variables + - apply: rename 'try' variables + - diff: rename 'this' variables + - rev-parse: rename 'this' variable + - pack-objects: rename 'this' variables + - blame: rename 'this' variables + - object: rename function 'typename' to 'type_name' + - object_info: change member name from 'typename' to 'type_name' + + +* ew/svn-branch-segfault-fix (2018-01-30) 1 commit + - git-svn: control destruction order to avoid segfault + + Workaround for segfault with more recent versions of SVN. + Will merge to 'next'. -* jh/object-filtering (2018-01-08) 1 commit - (merged to 'next' on 2018-01-11 at 56808f6969) - + oidset: don't return value from oidset_init - Hotfix for a topic already in 'master'. +* tz/doc-show-defaults-to-head (2018-01-30) 1 commit + - doc: mention 'git show' defaults to HEAD + Doc update. -* jk/abort-clone-with-existing-dest (2018-01-03) 4 commits - (merged to 'next' on 2018-01-09 at 3c8e83c3a7) - + clone: do not clean up directories we didn't create - + clone: factor out dir_exists() helper - + t5600: modernize style - + t5600: fix outdated comment about unborn HEAD + Will merge to 'next'. - "git clone $there $here" is allowed even when here directory exists - as long as it is an empty directory, but the command incorrectly - removed it upon a failure of the operation. +* nd/ignore-glob-doc-update (2018-01-31) 1 commit + - gitignore.txt: elaborate shell glob syntax -* jm/svn-pushmergeinfo-fix (2017-09-17) 1 commit - (merged to 'next' on 2018-01-05 at 6cb237ea44) - + git-svn: fix svn.pushmergeinfo handling of svn+ssh usernames. - "git svn dcommit" did not take into account the fact that a - svn+ssh:// URL with a username@ (typically used for pushing) refers - to the same SVN repository without the username@ and failed when - svn.pushmergeinfo option is set. +* nd/rebase-show-current-patch (2018-01-31) 3 commits + - rebase: introduce and use pseudo-ref ORIG_COMMIT + - rebase: add --show-current-patch + - am: add --show-current-patch + +-------------------------------------------------- +[Stalled] + +* av/fsmonitor-updates (2018-01-04) 6 commits + - fsmonitor: use fsmonitor data in `git diff` + - fsmonitor: remove debugging lines from t/t7519-status-fsmonitor.sh + - fsmonitor: make output of test-dump-fsmonitor more concise + - fsmonitor: update helper tool, now that flags are filled later + - fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid + - dir.c: update comments to match argument name + Code clean-up on fsmonitor integration, plus optional utilization + of the fsmonitor data in diff-files. -* js/fix-merge-arg-quoting-in-rebase-p (2018-01-05) 1 commit - (merged to 'next' on 2018-01-09 at 91f5601e9c) - + rebase -p: fix quoting when calling `git merge` + Waiting for an update. + cf. - "git rebase -p -X