From 30a9c26739772d5e224f635e7f705dc30ecbedb7 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Thu, 5 Dec 2019 14:33:37 -0800 Subject: [PATCH] What's cooking (2019/12 #02) --- whats-cooking.txt | 1425 +++++++++++++++++---------------------------- 1 file changed, 543 insertions(+), 882 deletions(-) diff --git a/whats-cooking.txt b/whats-cooking.txt index 2845e3eae0..ee63b9195b 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 (Dec 2019, #01; Mon, 2) -X-master-at: 228f53135a4a41a37b6be8e4d6e2b6153db4a8ed -X-next-at: e41a19f04e19db375f8e58b74c6cb9d3a1495be5 +Subject: What's cooking in git.git (Dec 2019, #02; Thu, 5) +X-master-at: 083378cc35c4dbcc607e4cdd24a5fca440163d17 +X-next-at: f85fac6f6eedeb72469441dac97a7b59b027bf1f -What's cooking in git.git (Dec 2019, #01; Mon, 2) +What's cooking in git.git (Dec 2019, #02; Thu, 5) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,10 +12,7 @@ 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 second batch of topics are now in 'master'; this was a rather -large update, so there might be some fallout. Many topics are still -in 'next' to be merged to 'master' soonish, and many others are -waiting to be in 'next'. +The third batch of topics are now in 'master'. You can find the changes described here in the integration branches of the repositories listed at @@ -25,446 +22,17 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ar/install-doc-update-cmds-needing-the-shell (2019-11-15) 1 commit - (merged to 'next' on 2019-11-19 at 216468eb98) - + INSTALL: use existing shell scripts as example +* dd/rebase-merge-reserves-onto-label (2019-11-20) 1 commit + (merged to 'next' on 2019-11-21 at a6e4e5af0a) + + sequencer: handle rebase-merges for "onto" message + (this branch uses js/rebase-r-safer-label.) - Doc update. - - -* cb/curl-use-xmalloc (2019-11-07) 1 commit - (merged to 'next' on 2019-11-19 at 1c587d0775) - + remote-curl: unbreak http.extraHeader with custom allocators - - HTTP transport had possible allocator/deallocator mismatch, which + The logic to avoid duplicate label names generated by "git rebase + --rebase-merges" forgot that the machinery itself uses "onto" as a + label name, which must be avoided by auto-generated labels, which has been corrected. -* dd/sequencer-utf8 (2019-11-11) 8 commits - (merged to 'next' on 2019-11-19 at 9432ddc32c) - + sequencer: reencode commit message for am/rebase --show-current-patch - + sequencer: reencode old merge-commit message - + sequencer: reencode squashing commit's message - + sequencer: reencode revert/cherry-pick's todo list - + sequencer: reencode to utf-8 before arrange rebase's todo list - + t3900: demonstrate git-rebase problem with multi encoding - + configure.ac: define ICONV_OMITS_BOM if necessary - + t0028: eliminate non-standard usage of printf - - Handling of commit objects that use non UTF-8 encoding during - "rebase -i" has been improved. - - -* dj/typofix-merge-strat (2019-11-11) 1 commit - (merged to 'next' on 2019-11-19 at 5b6c0cf125) - + merge-strategies: fix typo "reflected to" to "reflected in" - - Typofix. - - -* dl/complete-rebase-onto (2019-11-12) 1 commit - (merged to 'next' on 2019-11-19 at ba53946a3b) - + completion: learn to complete `git rebase --onto=` - - The completion script (in contrib/) learned that the "--onto" - option of "git rebase" can take its argument as the value of the - option. - - -* dl/doc-diff-no-index-implies-exit-code (2019-11-02) 1 commit - (merged to 'next' on 2019-11-19 at e2b2181e28) - + git-diff.txt: document return code of `--no-index` - - Doc update. - - -* ds/test-read-graph (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at 80152fc082) - + test-tool: use 'read-graph' helper - - Dev support for commit-graph feature. - - -* en/doc-typofix (2019-11-10) 10 commits - (merged to 'next' on 2019-11-19 at e7bfe50de5) - + Fix spelling errors in no-longer-updated-from-upstream modules - + multimail: fix a few simple spelling errors - + sha1dc: fix trivial comment spelling error - + Fix spelling errors in test commands - + Fix spelling errors in messages shown to users - + Fix spelling errors in names of tests - + Fix spelling errors in comments of testcases - + Fix spelling errors in code comments - + Fix spelling errors in documentation outside of Documentation/ - + Documentation: fix a bunch of typos, both old and new - - Docfix. - - -* en/misc-doc-fixes (2019-11-07) 3 commits - (merged to 'next' on 2019-11-19 at 7222cf3720) - + name-hash.c: remove duplicate word in comment - + hashmap: fix documentation misuses of -> versus . - + git-filter-branch.txt: correct argument name typo - - Misc doc fixes. - - -* en/t6024-style (2019-11-07) 1 commit - (merged to 'next' on 2019-11-19 at b41c2ed21b) - + t6024: modernize style - - Test updates. - - -* es/myfirstcontrib-updates (2019-11-02) 3 commits - (merged to 'next' on 2019-11-19 at 41d70e1db4) - + myfirstcontrib: hint to find gitgitgadget allower - + myfirstcontrib: add dependency installation step - + myfirstcontrib: add 'psuh' to command-list.txt - - Doc updates. - - -* hw/config-doc-in-header (2019-10-24) 1 commit - (merged to 'next' on 2019-11-19 at 7f314c649e) - + config: move documentation to config.h - - Follow recent push to move API docs from Documentation/ to header - files and update config.h - - -* jc/fsmonitor-sanity-fix (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at 1fceb9b55b) - + fsmonitor: do not compare bitmap size with size of split index - (this branch is used by us/unpack-trees-fsmonitor.) - - Remove an incorrect BUG() that should not trigger. - - -* jc/log-graph-simplify (2019-11-13) 14 commits - (merged to 'next' on 2019-11-19 at de6360c648) - + t4215: use helper function to check output - (merged to 'next' on 2019-11-10 at 79d2b8ff98) - + graph: fix coloring of octopus dashes - + graph: flatten edges that fuse with their right neighbor - + graph: smooth appearance of collapsing edges on commit lines - + graph: rename `new_mapping` to `old_mapping` - + graph: commit and post-merge lines for left-skewed merges - + graph: tidy up display of left-skewed merges - + graph: example of graph output that can be simplified - + graph: extract logic for moving to GRAPH_PRE_COMMIT state - + graph: remove `mapping_idx` and `graph_update_width()` - + graph: reduce duplication in `graph_insert_into_new_columns()` - + graph: reuse `find_new_column_by_commit()` - + graph: handle line padding in `graph_next_line()` - + graph: automatically track display width of graph lines - - The implementation of "git log --graph" got refactored and then its - output got simplified. - - -* jk/cleanup-object-parsing-and-fsck (2019-10-28) 23 commits - (merged to 'next' on 2019-11-10 at 50b2267a2a) - + fsck: accept an oid instead of a "struct tree" for fsck_tree() - + fsck: accept an oid instead of a "struct commit" for fsck_commit() - + fsck: accept an oid instead of a "struct tag" for fsck_tag() - + fsck: rename vague "oid" local variables - + fsck: don't require an object struct in verify_headers() - + fsck: don't require an object struct for fsck_ident() - + fsck: drop blob struct from fsck_finish() - + fsck: accept an oid instead of a "struct blob" for fsck_blob() - + fsck: don't require an object struct for report() - + fsck: only require an oid for skiplist functions - + fsck: only provide oid/type in fsck_error callback - + fsck: don't require object structs for display functions - + fsck: use oids rather than objects for object_name API - + fsck_describe_object(): build on our get_object_name() primitive - + fsck: unify object-name code - + fsck: require an actual buffer for non-blobs - + fsck: stop checking tag->tagged - + fsck: stop checking commit->parent counts - + fsck: stop checking commit->tree value - + commit, tag: don't set parsed bit for parse failures - + parse_tag_buffer(): treat NULL tag pointer as parse error - + parse_commit_buffer(): treat lookup_tree() failure as parse error - + parse_commit_buffer(): treat lookup_commit() failure as parse error - - Originally merged to 'next' on 2019-10-30 - - Crufty code and logic accumulated over time around the object - parsing and low-level object access used in "git fsck" have been - cleaned up. - - -* jk/gitweb-anti-xss (2019-11-18) 4 commits - (merged to 'next' on 2019-11-19 at 69ef04c013) - + gitweb: escape URLs generated by href() - + t/gitweb-lib.sh: set $REQUEST_URI - + t/gitweb-lib.sh: drop confusing quotes - + t9502: pass along all arguments in xss helper - - Some codepaths in "gitweb" that forgot to escape URLs generated - based on end-user input have been corrected. - - -* jk/optim-in-pack-idx-conversion (2019-11-12) 1 commit - (merged to 'next' on 2019-11-19 at a81ebc7b8d) - + pack-objects: avoid pointless oe_map_new_pack() calls - - Code clean-up. - - -* jk/remove-sha1-to-hex (2019-11-13) 2 commits - (merged to 'next' on 2019-11-19 at fb68824870) - + hex: drop sha1_to_hex() - + hex: drop sha1_to_hex_r() - - Code clean-up. - - -* jk/send-pack-remote-failure (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at d02c0107ee) - + send-pack: check remote ref status on pack-objects failure - - Error handling after "git push" finishes sending the packdata and - waits for the response to the remote side has been improved. - - -* js/complete-svn-recursive (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at fa2a97911c) - + completion: tab-complete "git svn --recursive" - - The completion script (in contrib/) has been taught that "git svn" - supports the "--recursive" option. - - -* js/fetch-multi-lockfix (2019-11-06) 2 commits - (merged to 'next' on 2019-11-19 at b9683b7ec9) - + fetch: avoid locking issues between fetch.jobs/fetch.writeCommitGraph - + fetch: add the command-line option `--write-commit-graph` - - Fetching from multiple remotes into the same repository in parallel - had a bad interaction with the recent change to (optionally) update - the commit-graph after a fetch job finishes, as these parallel - fetches compete with each other. Which has been corrected. - - -* js/git-path-head-dot-lock-fix (2019-10-29) 2 commits - (merged to 'next' on 2019-11-19 at b406944979) - + git_path(): handle `.lock` files correctly - + t1400: wrap setup code in test case - - "git rev-parse --git-path HEAD.lock" did not give the right path - when run in a secondary worktree. - - -* js/vreportf-wo-buffering (2019-11-02) 1 commit - (merged to 'next' on 2019-11-19 at cae61b9899) - + vreportf(): avoid relying on stdio buffering - - Messages from die() etc. can be mixed up from multiple processes - without even line buffering on Windows, which has been worked - around. - - -* jt/fetch-remove-lazy-fetch-plugging (2019-11-13) 3 commits - (merged to 'next' on 2019-11-19 at 1b26c28dcd) - + promisor-remote: remove fetch_if_missing=0 - + clone: remove fetch_if_missing=0 - + fetch: remove fetch_if_missing=0 - - "git fetch" codepath had a big "do not lazily fetch missing objects - when I ask if something exists" switch. This has been corrected by - marking the "does this thing exist?" calls with "if not please do not - lazily fetch it" flag. - - -* kw/fsmonitor-watchman-fix (2019-11-06) 1 commit - (merged to 'next' on 2019-11-19 at ee786a5c39) - + fsmonitor: fix watchman integration - - The watchman integration for fsmonitor was racy, which has been - corrected to be more conservative. - - -* ln/userdiff-elixir (2019-11-10) 1 commit - (merged to 'next' on 2019-11-19 at 6318918ba8) - + userdiff: add Elixir to supported userdiff languages - - The patterns to detect function boundary for Elixir language has - been added. - - -* ma/bisect-doc-sample-update (2019-10-29) 1 commit - (merged to 'next' on 2019-11-19 at bde6adce1b) - + Documentation/git-bisect.txt: add --no-ff to merge command - - "git merge --no-commit" needs "--no-ff" if you do not want to move - HEAD, which has been corrected in the manual page for "git bisect". - - -* ma/t7004 (2019-11-14) 1 commit - (merged to 'next' on 2019-11-19 at 789a0a0f05) - + t7004: check existence of correct tag - - Test fix. - - -* mr/clone-dir-exists-to-path-exists (2019-10-29) 1 commit - (merged to 'next' on 2019-11-19 at 07b6ab25de) - + clone: rename static function `dir_exists()`. - - Code cleanup. - - -* nn/doc-rebase-merges (2019-11-12) 1 commit - (merged to 'next' on 2019-11-19 at db74ff488c) - + doc: improve readability of --rebase-merges in git-rebase - - Doc update. - - -* ns/test-desc-typofix (2019-11-07) 1 commit - (merged to 'next' on 2019-11-19 at 804861f385) - + t: fix typo in test descriptions - - Typofix. - - -* pb/help-list-gitsubmodules-among-guides (2019-10-29) 1 commit - (merged to 'next' on 2019-11-19 at 3c6f5c1901) - + help: add gitsubmodules to the list of guides - - Help update. - - -* pb/no-recursive-reset-hard-in-worktree-add (2019-10-30) 1 commit - (merged to 'next' on 2019-11-19 at cdfb0643e9) - + worktree: teach "add" to ignore submodule.recurse config - - "git worktree add" internally calls "reset --hard" that should not - descend into submodules, even when submodule.recurse configuration - is set, but it was affected. This has been corrected. - - -* py/shortlog-list-options-for-log (2019-11-10) 1 commit - (merged to 'next' on 2019-11-19 at 92a10e39f7) - + git-shortlog.txt: include commit limiting options - - Documentation pages for "git shortlog" now lists commit limiting - options explicitly. - - -* rj/bundle-ui-updates (2019-11-11) 3 commits - (merged to 'next' on 2019-11-19 at d88f626256) - + bundle-verify: add --quiet - + bundle-create: progress output control - + bundle: framework for options before bundle file - - "git bundle" has been taught to use the parse options API. "git - bundle verify" learned "--quiet" and "git bundle create" learned - options to control the progress output. - - -* rs/parse-options-dup-null-fix (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at 73040e1605) - + parse-options: avoid arithmetic on pointer that's potentially NULL - - Code cleanup. - - -* rs/skip-iprefix (2019-11-10) 2 commits - (merged to 'next' on 2019-11-19 at c87ae31b14) - + convert: use skip_iprefix() in validate_encoding() - + utf8: use skip_iprefix() in same_utf_encoding() - - Code simplification. - - -* rs/trace2-dots (2019-11-06) 1 commit - (merged to 'next' on 2019-11-19 at a045233ad0) - + trace2: add dots directly to strbuf in perf_fmt_prepare() - - Code cleanup. - - -* rs/use-copy-array-in-mingw-shell-command-preparation (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at 52ee6a8887) - + mingw: use COPY_ARRAY for copying array - - Code cleanup. - - -* rt/fetch-message-fix (2019-11-02) 1 commit - (merged to 'next' on 2019-11-19 at 69eb337cd8) - + fetch.c: fix typo in a warning message - - A small message update. - - -* sg/blame-indent-heuristics-is-now-the-default (2019-10-29) 1 commit - (merged to 'next' on 2019-11-19 at 68e60f08cc) - + builtin/blame.c: remove '--indent-heuristic' from usage string - - Message update. - - -* sg/skip-skipped-prereq (2019-11-13) 1 commit - (merged to 'next' on 2019-11-19 at 10d344fed7) - + test-lib: don't check prereqs of test cases that won't be run anyway - - Test update to avoid wasted cycles. - - -* tg/stash-refresh-index (2019-11-14) 1 commit - (merged to 'next' on 2019-11-19 at 4d67af8d3f) - + stash: make sure we have a valid index before writing it - - Recent update to "git stash pop" made the command empty the index - when run with the "--quiet" option, which has been corrected. - --------------------------------------------------- -[New Topics] - -* ds/commit-graph-delay-gen-progress (2019-11-27) 2 commits - - commit-graph: use start_delayed_progress() - - progress: create GIT_PROGRESS_DELAY - - One kind of progress messages were always given during commit-graph - generation, instead of following the "if it takes more than two - seconds, show progress" pattern, which has been corrected. - - Will merge to 'next'. - - -* ds/sparse-cone (2019-11-22) 19 commits - - sparse-checkout: check for dirty status - - sparse-checkout: update working directory in-process for 'init' - - sparse-checkout: cone mode should not interact with .gitignore - - sparse-checkout: write using lockfile - - sparse-checkout: use in-process update for disable subcommand - - sparse-checkout: update working directory in-process - - sparse-checkout: sanitize for nested folders - - unpack-trees: add progress to clear_ce_flags() - - unpack-trees: hash less in cone mode - - sparse-checkout: init and set in cone mode - - sparse-checkout: use hashmaps for cone patterns - - sparse-checkout: add 'cone' mode - - trace2: add region in clear_ce_flags - - sparse-checkout: create 'disable' subcommand - - sparse-checkout: add '--stdin' option to set subcommand - - sparse-checkout: 'set' subcommand - - clone: add --sparse mode - - sparse-checkout: create 'init' subcommand - - sparse-checkout: create builtin with 'list' subcommand - - Management of sparsely checked-out working tree has gained a - dedicated "sparse-checkout" command. - - How well is this topic done at this point? - - * dl/range-diff-with-notes (2019-11-21) 10 commits (merged to 'next' on 2019-11-25 at dd6dad97c1) + format-patch: pass notes configuration to range-diff @@ -482,118 +50,40 @@ of the repositories listed at "--no-notes" options to control the commit notes included in the log message that gets compared. - Will merge to 'master'. - -* jc/azure-ci-osx-fix-fix (2019-11-20) 1 commit - (merged to 'next' on 2019-11-25 at 7de6356e67) - + ci(osx): update homebrew-cask repository with less noise - - CI jobs for macOS has been made less chatty when updating perforce - package used during testing. - - Will merge to 'master'. - - -* jk/fail-show-toplevel-outside-working-tree (2019-11-20) 1 commit - (merged to 'next' on 2019-11-25 at cd97ae38bc) - + rev-parse: make --show-toplevel without a worktree an error - - "git rev-parse --show-toplevel" run outside of any working tree did - not error out, which has been corrected. - - Will merge to 'master'. - - -* pb/submodule-update-fetches (2019-11-24) 1 commit - (merged to 'next' on 2019-11-25 at 7736f98351) - + doc: mention that 'git submodule update' fetches missing commits - - Doc update. - - Will merge to 'master'. - - -* sg/unpack-progress-throughput (2019-11-20) 1 commit - (merged to 'next' on 2019-11-25 at 0418db6a27) - + builtin/unpack-objects.c: show throughput progress - - "git unpack-objects" used to show progress based only on the number - of received and unpacked objects, which stalled when it has to - handle an unusually large object. It now shows the throughput as - well. - - Will merge to 'master'. - - -* dl/test-cleanup (2019-11-29) 26 commits - - t7700: stop losing return codes of git commands - - t7700: make references to SHA-1 generic - - t7700: replace egrep with grep - - t7700: consolidate code into test_has_duplicate_object() - - t7700: consolidate code into test_no_missing_in_packs() - - t7700: s/test -f/test_path_is_file/ - - t7700: move keywords onto their own line - - t7700: remove spaces after redirect operators - - t7700: drop redirections to /dev/null - - t7501: stop losing return codes of git commands - - t7501: remove spaces after redirect operators - - t5703: stop losing return codes of git commands - - t5703: simplify one-time-sed generation logic - - t5317: use ! grep to check for no matching lines - - t5317: stop losing return codes of git commands - - t4138: stop losing return codes of git commands - - t4015: use test_write_lines() - - t4015: stop losing return codes of git commands - - t3600: comment on inducing SIGPIPE in `git rm` - - t3600: stop losing return codes of git commands - - t3600: use test_line_count() where possible - - t3301: stop losing return codes of git commands - - t0090: stop losing return codes of git commands - - t0014: remove git command upstream of pipe - - apply-one-time-sed.sh: modernize style - - lib-bash.sh: move `then` onto its own line +* dl/t5520-cleanup (2019-11-21) 15 commits + (merged to 'next' on 2019-11-27 at 523d920acf) + + t5520: replace `! git` with `test_must_fail git` + + t5520: remove redundant lines in test cases + + t5520: replace $(cat ...) comparison with test_cmp + + t5520: don't put git in upstream of pipe + + t5520: test single-line files by git with test_cmp + + t5520: use test_cmp_rev where possible + + t5520: replace test -{n,z} with test-lib functions + + t5520: use test_line_count where possible + + t5520: remove spaces after redirect operator + + t5520: replace test -f with test-lib functions + + t5520: let sed open its own input + + t5520: use sq for test case names + + t5520: improve test style + + t: teach test_cmp_rev to accept ! for not-equals + + t0000: test multiple local assignment Test cleanup. - Will merge to 'next'. + +* ec/fetch-mark-common-refs-trace2 (2019-11-20) 1 commit + (merged to 'next' on 2019-11-25 at c2b8e1546c) + + fetch: add trace2 instrumentation + + Trace2 annotation. -* tg/perf-remove-stale-result (2019-11-27) 1 commit - - perf-lib: use a single filename for all measurement types +* ep/guard-kset-tar-headers (2019-11-07) 1 commit + (merged to 'next' on 2019-11-21 at 6c9574b01d) + + kset.h, tar.h: add missing header guard to prevent multiple inclusion - PerfTest fix to avoid stale result mixed up with the latest round - of test results. - - Will merge to 'next'. - - -* us/unpack-trees-fsmonitor (2019-11-21) 1 commit - (merged to 'next' on 2019-11-27 at 4c06f74957) - + unpack-trees: skip stat on fsmonitor-valid files - - Users of oneway_merge() (like "reset --hard") learned to take - advantage of fsmonitor to avoid unnecessary lstat(2) calls. - - Will merge to 'master'. - - -* ds/fsmonitor-testing (2019-11-22) 11 commits - - test-lib: clear watchman watches at test completion - - t7519: disable external GIT_TEST_FSMONITOR variable - - t7063: disable fsmonitor with status cache - - tests: disable fsmonitor in submodule tests - - t3600-rm.sh: disable fsmonitor when deleting populated submodule - - t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE - - fsmonitor: disable fsmonitor with worktrees - - t1510-repo-setup.sh: disable fsmonitor if no .git dir - - t1301-shared-repo.sh: disable FSMONITOR - - fsmonitor: do not output to stderr for tests - - fsmonitor: disable in a bare repo - - Updates around testing fsmoitor integration. - - Will merge to 'next'. + Code clean-up. * hi/gpg-optional-pkfp-fix (2019-11-23) 2 commits @@ -606,8 +96,6 @@ of the repositories listed at finterprint for the primary key would always be present for a valid signature, which has been corrected. - Will merge to 'master'. - * hv/assume-priumax-is-available-anywhere (2019-11-25) 1 commit (merged to 'next' on 2019-11-27 at caac4f633d) @@ -619,7 +107,45 @@ of the repositories listed at fallback macro definitions for these macros that must appear in C99 systems have been removed. - Will merge to 'master'. + +* jc/azure-ci-osx-fix-fix (2019-11-20) 1 commit + (merged to 'next' on 2019-11-25 at 7de6356e67) + + ci(osx): update homebrew-cask repository with less noise + + CI jobs for macOS has been made less chatty when updating perforce + package used during testing. + + +* jh/userdiff-python-async (2019-11-20) 1 commit + (merged to 'next' on 2019-11-25 at 74e4a4ed9f) + + userdiff: support Python async functions + + The userdiff machinery has been taught that "async def" is another + way to begin a "function" in Python. + + +* jk/fail-show-toplevel-outside-working-tree (2019-11-20) 1 commit + (merged to 'next' on 2019-11-25 at cd97ae38bc) + + rev-parse: make --show-toplevel without a worktree an error + + "git rev-parse --show-toplevel" run outside of any working tree did + not error out, which has been corrected. + + +* js/builtin-add-i (2019-11-18) 9 commits + (merged to 'next' on 2019-11-21 at caefa55b89) + + built-in add -i: implement the `help` command + + built-in add -i: use color in the main loop + + built-in add -i: support `?` (prompt help) + + built-in add -i: show unique prefixes of the commands + + built-in add -i: implement the main loop + + built-in add -i: color the header in the `status` command + + built-in add -i: implement the `status` command + + diff: export diffstat interface + + Start to implement a built-in version of `git add --interactive` + (this branch is used by js/builtin-add-i-cmds.) + + The beginning of rewriting "git add -i" in C. * js/git-svn-use-rebase-merges (2019-11-23) 1 commit @@ -628,24 +154,24 @@ of the repositories listed at Prepare further for "rebase --preserve-merges" deprecation. - Will merge to 'master'. + +* js/pkt-line-h-typofix (2019-12-02) 1 commit + (merged to 'next' on 2019-12-02 at 8f36a354ae) + + pkt-line: fix a typo + + Typofix. -* js/mingw-inherit-only-std-handles (2019-12-02) 6 commits - - mingw: translate ERROR_SUCCESS to errno = 0 - (merged to 'next' on 2019-12-02 at 798a952eca) - + mingw: do set `errno` correctly when trying to restrict handle inheritance - (merged to 'next' on 2019-11-27 at 4736894af6) - + mingw: restrict file handle inheritance only on Windows 7 and later - + mingw: spawned processes need to inherit only standard handles - + mingw: work around incorrect standard handles - + mingw: demonstrate that all file handles are inherited by child processes +* js/rebase-r-safer-label (2019-11-18) 2 commits + (merged to 'next' on 2019-11-21 at 791d51b0d7) + + rebase -r: let `label` generate safer labels + + rebase-merges: move labels' whitespace mangling into `label_oid()` + (this branch is used by dd/rebase-merge-reserves-onto-label.) - Work around a issue where a FD that is left open when spawning a - child process and is kept open in the child can interfere with the - operation in the parent process on Windows. - - Will wait for a bit before merging to 'next'. + A label used in the todo list that are generated by "git rebase + --rebase-merges" is used as a part of a refname; the logic to come + up with the label has been tightened to avoid names that cannot be + used as such. * mg/doc-submodule-status-cached (2019-11-24) 1 commit @@ -656,8 +182,6 @@ of the repositories listed at different things, but the documentation did not cover them correctly, which has been corrected. - Will merge to 'master'. - * mg/submodule-status-from-a-subdirectory (2019-11-25) 1 commit (merged to 'next' on 2019-11-27 at 24cb2d79ff) @@ -666,8 +190,6 @@ of the repositories listed at "git submodule status" that is run from a subdirectory of the superproject did not work well, which has been corrected. - Will merge to 'master'. - * mh/clear-topo-walk-upon-reset (2019-11-25) 2 commits (merged to 'next' on 2019-11-27 at 15871c1c2a) @@ -679,8 +201,6 @@ of the repositories listed at begins, but the resources related to topological walk were not cleared correctly, which has been corrected. - Will merge to 'master'. - * nl/reset-patch-takes-a-tree (2019-11-25) 1 commit (merged to 'next' on 2019-11-25 at 34dc348eaf) @@ -690,7 +210,12 @@ of the repositories listed at tree object to be given, but incorrectly required a committish, which has been corrected. - Will merge to 'master'. + +* pb/submodule-update-fetches (2019-11-24) 1 commit + (merged to 'next' on 2019-11-25 at 7736f98351) + + doc: mention that 'git submodule update' fetches missing commits + + Doc update. * pw/sequencer-compare-with-right-parent-to-check-empty-commits (2019-11-23) 1 commit @@ -702,20 +227,6 @@ of the repositories listed at commit, even when amending a commit, which was incorrect, and has been corrected. - Will merge to 'master'. - - -* sg/assume-no-todo-update-in-cherry-pick (2019-11-24) 1 commit - (merged to 'next' on 2019-11-27 at 6908186f85) - + sequencer: don't re-read todo for revert and cherry-pick - - While running "revert" or "cherry-pick --edit" for multiple - commits, a recent regression incorrectly detected "nothing to - commit, working tree clean", instead of replaying the commits, - which has been corrected. - - Will merge to 'master'. - * sg/test-bool-env (2019-11-23) 2 commits (merged to 'next' on 2019-11-27 at e1874e422f) @@ -728,188 +239,131 @@ of the repositories listed at sure we notice and fail when non-bool strings are given to these variables. + +* sg/unpack-progress-throughput (2019-11-20) 1 commit + (merged to 'next' on 2019-11-25 at 0418db6a27) + + builtin/unpack-objects.c: show throughput progress + + "git unpack-objects" used to show progress based only on the number + of received and unpacked objects, which stalled when it has to + handle an unusually large object. It now shows the throughput as + well. + + +* us/unpack-trees-fsmonitor (2019-11-21) 1 commit + (merged to 'next' on 2019-11-27 at 4c06f74957) + + unpack-trees: skip stat on fsmonitor-valid files + + Users of oneway_merge() (like "reset --hard") learned to take + advantage of fsmonitor to avoid unnecessary lstat(2) calls. + +-------------------------------------------------- +[New Topics] + +* am/pathspec-f-f-checkout (2019-12-04) 7 commits + - checkout, restore: support the --pathspec-from-file option + - doc: restore: synchronize description + - doc: checkout: synchronize description + - doc: checkout: fix broken text reference + - doc: checkout: remove duplicate synopsis + - add: support the --pathspec-from-file option + - cmd_add: prepare for next patch + (this branch uses am/pathspec-from-file; is tangled with es/pathspec-f-f-grep.) + + A few more commands learned the "--pathspec-from-file" command line + option. + + Will merge to 'next'. + + +* dl/lore-is-the-archive (2019-12-04) 3 commits + (merged to 'next' on 2019-12-05 at c87e168cd6) + + doc: replace LKML link with lore.kernel.org + + RelNotes: replace Gmane with real Message-IDs + + doc: replace MARC links with lore.kernel.org + (this branch uses jk/lore-is-the-archive.) + + Publicize lore.kernel.org mailing list archive and use URLs + pointing into it to refer to notable messages in the documentation. + Will merge to 'master'. -* as/t7812-missing-redirects-fix (2019-12-01) 2 commits - - t7812: expect failure for grep -i with invalid UTF-8 data - - t7812: add missing redirects +* dl/rebase-with-autobase (2019-12-05) 5 commits + - rebase: fix format.useAutoBase breakage + - format-patch: teach --no-base + - t4014: use test_config() + - format-patch: fix indentation + - t3400: demonstrate failure with format.useAutoBase - Test fix. + "git rebase" did not work well when format.useAutoBase + configuration variable is set, which has been corrected. Will merge to 'next'. -* jk/perf-wo-git-dot-pm (2019-11-27) 1 commit - - t/perf: don't depend on Git.pm +* es/pathspec-f-f-grep (2019-12-04) 1 commit + - grep: support the --pathspec-from-file option + (this branch uses am/pathspec-from-file; is tangled with am/pathspec-f-f-checkout.) - Test cleanup. + "git grep" learned the "--pathspec-from-file" command line + option. + + Waiting for review response. + + +* rs/xdiff-ignore-ws-w-func-context (2019-12-05) 1 commit + - xdiff: unignore changes in function context + + The "diff" machinery learned not to lose added/removed blank lines + in the context when --ignore-blank-lines and --function-context are + used at the same time. Will merge to 'next'. -* jt/clone-recursesub-ref-advise (2019-11-27) 2 commits - - submodule--helper: advise on fatal alternate error - - Documentation: explain submodule.alternateErrorStrategy +* ag/edit-todo-drop-check (2019-12-04) 2 commits + - rebase-interactive: warn if commit is dropped with `rebase --edit-todo' + - sequencer: move check_todo_list_from_file() to rebase-interactive.c + (this branch uses ag/sequencer-todo-updates.) - The interaction between "git clone --recurse-submodules" and - alternate object store was ill-designed. The documentation and - code have been taught to make more clear recommendations when the - users see failures. + Allow the rebase.missingCommitsCheck configuration to kick in when + "rebase --edit-todo" and "rebase --continue" restarts the procedure. - Will merge to 'next'. + Seems to break when merged to 'pu'. -* ra/t5150-depends-on-perl (2019-11-27) 1 commit - . t5150: skip request-pull test if Perl is disabled - - Some Porcelain commands are written in Perl, and tests on them are - expected not to work when the platform lacks a working perl. - - Redo. - - -* rs/simplify-prepare-cmd (2019-11-27) 1 commit - - run-command: use prepare_git_cmd() in prepare_cmd() - - Code cleanup. - - Will merge to 'next'. - - -* rs/test-cleanup (2019-11-30) 7 commits - - t7811: don't create unused file - - t9300: don't create unused file - - test: use test_must_be_empty F instead of test_cmp empty F - - test: use test_must_be_empty F instead of test -z $(cat F) - - t1400: use test_must_be_empty - - t1410: use test_line_count - - t1512: use test_line_count - - Test cleanup. - - Will merge to 'next'. - - -* rs/use-skip-prefix-more (2019-11-27) 5 commits - - name-rev: use skip_prefix() instead of starts_with() - - push: use skip_prefix() instead of starts_with() - - shell: use skip_prefix() instead of starts_with() - - fmt-merge-msg: use skip_prefix() instead of starts_with() - - fetch: use skip_prefix() instead of starts_with() - - Code cleanup. - - Will merge to 'next'. - - -* sg/test-squelch-noise-in-commit-bulk (2019-11-27) 1 commit - - test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' - - Code cleanup. - - Will merge to 'next'. - - -* ag/sequencer-continue-leakfix (2019-11-30) 1 commit - - sequencer: fix a memory leak in sequencer_continue() - - Leakfix. - - Will merge to 'next'. - - -* bc/t9001-zsh-in-posix-emulation-mode (2019-11-30) 1 commit - - t9001: avoid including non-trailing NUL bytes in variables - - Test portability fix. - - Will merge to 'next'. - - -* cs/store-packfiles-in-hashmap (2019-12-01) 1 commit - - packfile.c: speed up loading lots of packfiles - - In a repository with many packfiles, the cost of the procedure that - avoids registering the same packfile twice was unnecessarily high - by using an inefficient search algorithm, which has been corrected. - - Will merge to 'next'. - - -* dd/time-reentrancy (2019-12-01) 3 commits - - mingw: use {gm,local}time_s as backend for {gm,local}time_r - - archive-zip.c: switch to reentrant localtime_r - - date.c: switch to reentrant {gm,local}time_r - - Avoid gmtime() and localtime() and prefer their reentrant - counterparts. - - Will merge to 'next'. - - -* em/test-skip-regex-illseq (2019-11-30) 1 commit - - t4210: skip i18n tests that don't work on FreeBSD - - Test portability fix. - - Will merge to 'next'. - - -* hi/gpg-use-check-signature (2019-11-30) 1 commit - - gpg-interface: prefer check_signature() for GPG verification - (this branch uses hi/gpg-optional-pkfp-fix.) - - Hide lower-level verify_signed-buffer() API as a pure helper to - implement the public check_signature() function, in order to - encourage new callers to use the correct and more strict - validation. - - Will merge to 'next'. - - -* hi/grep-do-not-return-void (2019-11-30) 1 commit - - grep: don't return an expression from pcre2_free() - - Code cleanup. - - Will merge to 'next'. - - -* jk/lore-is-the-archive (2019-11-30) 2 commits - - doc: replace public-inbox links with lore.kernel.org - - doc: recommend lore.kernel.org over public-inbox.org - - Doc update for the mailing list archiving and nntp service. - - Will merge to 'next'. - - -* jk/send-pack-check-negative-with-quick (2019-11-30) 1 commit - - send-pack: use OBJECT_INFO_QUICK to check negative objects - - Performance tweak on "git push" into a repository with many refs - that point at objects we have never heard of. - - Will merge to 'next'. - - -* sg/osx-force-gcc-9 (2019-11-29) 1 commit - - ci: build Git with GCC 9 in the 'osx-gcc' build job - - TravisCI update. - - Will merge to 'next'. - -------------------------------------------------- [Stalled] +* mt/threaded-grep-in-object-store (2019-10-02) 11 commits + - grep: move driver pre-load out of critical section + - grep: re-enable threads in non-worktree case + - grep: protect packed_git [re-]initialization + - grep: allow submodule functions to run in parallel + - submodule-config: add skip_if_read option to repo_read_gitmodules() + - grep: replace grep_read_mutex by internal obj read lock + - object-store: allow threaded access to object reading + - replace-object: make replace operations thread-safe + - grep: fix racy calls in grep_objects() + - grep: fix race conditions at grep_submodule() + - grep: fix race conditions on userdiff calls + + Traditionally, we avoided threaded grep while searching in objects + (as opposed to files in the working tree) as accesses to the object + layer is not thread-safe. This limitation is getting lifted. + + Expecting a reroll. + cf. + + * po/bundle-doc-clonable (2019-10-21) 1 commit - - Doc: Bundle file usage + (merged to 'next' on 2019-12-02 at bd7fa24ad6) + + Doc: Bundle file usage Doc update. - Expecting a reroll. + Will merge to 'master'. * js/advise-rebase-skip (2019-10-23) 3 commits @@ -978,34 +432,345 @@ of the repositories listed at -------------------------------------------------- [Cooking] -* jh/userdiff-python-async (2019-11-20) 1 commit - (merged to 'next' on 2019-11-25 at 74e4a4ed9f) - + userdiff: support Python async functions +* ds/commit-graph-delay-gen-progress (2019-11-27) 2 commits + (merged to 'next' on 2019-12-05 at 9252a4b1b6) + + commit-graph: use start_delayed_progress() + + progress: create GIT_PROGRESS_DELAY - The userdiff machinery has been taught that "async def" is another - way to begin a "function" in Python. + One kind of progress messages were always given during commit-graph + generation, instead of following the "if it takes more than two + seconds, show progress" pattern, which has been corrected. + + Will merge to 'master'. + + +* ds/sparse-cone (2019-11-22) 19 commits + - sparse-checkout: check for dirty status + - sparse-checkout: update working directory in-process for 'init' + - sparse-checkout: cone mode should not interact with .gitignore + - sparse-checkout: write using lockfile + - sparse-checkout: use in-process update for disable subcommand + - sparse-checkout: update working directory in-process + - sparse-checkout: sanitize for nested folders + - unpack-trees: add progress to clear_ce_flags() + - unpack-trees: hash less in cone mode + - sparse-checkout: init and set in cone mode + - sparse-checkout: use hashmaps for cone patterns + - sparse-checkout: add 'cone' mode + - trace2: add region in clear_ce_flags + - sparse-checkout: create 'disable' subcommand + - sparse-checkout: add '--stdin' option to set subcommand + - sparse-checkout: 'set' subcommand + - clone: add --sparse mode + - sparse-checkout: create 'init' subcommand + - sparse-checkout: create builtin with 'list' subcommand + + Management of sparsely checked-out working tree has gained a + dedicated "sparse-checkout" command. + + Possibly wait for Szeder? + cf. + + +* dl/test-cleanup (2019-12-04) 26 commits + - t7700: stop losing return codes of git commands + - t7700: make references to SHA-1 generic + - t7700: replace egrep with grep + - t7700: consolidate code into test_has_duplicate_object() + - t7700: consolidate code into test_no_missing_in_packs() + - t7700: s/test -f/test_path_is_file/ + - t7700: move keywords onto their own line + - t7700: remove spaces after redirect operators + - t7700: drop redirections to /dev/null + - t7501: stop losing return codes of git commands + - t7501: remove spaces after redirect operators + - t5703: stop losing return codes of git commands + - t5703: simplify one-time-sed generation logic + - t5317: use ! grep to check for no matching lines + - t5317: stop losing return codes of git commands + - t4138: stop losing return codes of git commands + - t4015: use test_write_lines() + - t4015: stop losing return codes of git commands + - t3600: comment on inducing SIGPIPE in `git rm` + - t3600: stop losing return codes of git commands + - t3600: use test_line_count() where possible + - t3301: stop losing return codes of git commands + - t0090: stop losing return codes of git commands + - t0014: remove git command upstream of pipe + - apply-one-time-sed.sh: modernize style + - lib-bash.sh: move `then` onto its own line + + Test cleanup. + + Will merge to 'next'. + + +* tg/perf-remove-stale-result (2019-11-27) 1 commit + (merged to 'next' on 2019-12-05 at 466f07fb63) + + perf-lib: use a single filename for all measurement types + + PerfTest fix to avoid stale result mixed up with the latest round + of test results. + + Will merge to 'master'. + + +* ds/fsmonitor-testing (2019-11-22) 11 commits + - test-lib: clear watchman watches at test completion + - t7519: disable external GIT_TEST_FSMONITOR variable + - t7063: disable fsmonitor with status cache + - tests: disable fsmonitor in submodule tests + - t3600-rm.sh: disable fsmonitor when deleting populated submodule + - t3030-merge-recursive.sh: disable fsmonitor when tweaking GIT_WORK_TREE + - fsmonitor: disable fsmonitor with worktrees + - t1510-repo-setup.sh: disable fsmonitor if no .git dir + - t1301-shared-repo.sh: disable FSMONITOR + - fsmonitor: do not output to stderr for tests + - fsmonitor: disable in a bare repo + + Updates around testing fsmoitor integration. + + On Hold. + cf. + + +* js/mingw-inherit-only-std-handles (2019-12-02) 6 commits + (merged to 'next' on 2019-12-05 at 289f13054b) + + mingw: forbid translating ERROR_SUCCESS to an errno value + (merged to 'next' on 2019-12-02 at 798a952eca) + + mingw: do set `errno` correctly when trying to restrict handle inheritance + (merged to 'next' on 2019-11-27 at 4736894af6) + + mingw: restrict file handle inheritance only on Windows 7 and later + + mingw: spawned processes need to inherit only standard handles + + mingw: work around incorrect standard handles + + mingw: demonstrate that all file handles are inherited by child processes + + Work around a issue where a FD that is left open when spawning a + child process and is kept open in the child can interfere with the + operation in the parent process on Windows. + + Will merge to 'master'. + + +* sg/assume-no-todo-update-in-cherry-pick (2019-11-24) 1 commit + (merged to 'next' on 2019-11-27 at 6908186f85) + + sequencer: don't re-read todo for revert and cherry-pick + + While running "revert" or "cherry-pick --edit" for multiple + commits, a recent regression incorrectly detected "nothing to + commit, working tree clean", instead of replaying the commits, + which has been corrected. + + Will merge to 'master'. + + +* as/t7812-missing-redirects-fix (2019-12-01) 2 commits + (merged to 'next' on 2019-12-05 at aa89a7945f) + + t7812: expect failure for grep -i with invalid UTF-8 data + + t7812: add missing redirects + + Test fix. + + Will merge to 'master'. + + +* jk/perf-wo-git-dot-pm (2019-11-27) 1 commit + (merged to 'next' on 2019-12-05 at 6d9e3930ec) + + t/perf: don't depend on Git.pm + + Test cleanup. + + Will merge to 'master'. + + +* jt/clone-recursesub-ref-advise (2019-12-03) 2 commits + (merged to 'next' on 2019-12-05 at fc071dddfe) + + submodule--helper: advise on fatal alternate error + + Doc: explain submodule.alternateErrorStrategy + + The interaction between "git clone --recurse-submodules" and + alternate object store was ill-designed. The documentation and + code have been taught to make more clear recommendations when the + users see failures. + + Will merge to 'master'. + + +* ra/t5150-depends-on-perl (2019-11-27) 1 commit + . t5150: skip request-pull test if Perl is disabled + + Some Porcelain commands are written in Perl, and tests on them are + expected not to work when the platform lacks a working perl. + + Redo. + + +* rs/simplify-prepare-cmd (2019-11-27) 1 commit + (merged to 'next' on 2019-12-02 at 12e1a9e935) + + run-command: use prepare_git_cmd() in prepare_cmd() + + Code cleanup. + + Will merge to 'master'. + + +* rs/test-cleanup (2019-11-30) 7 commits + (merged to 'next' on 2019-12-02 at eabc2e30f5) + + t7811: don't create unused file + + t9300: don't create unused file + + test: use test_must_be_empty F instead of test_cmp empty F + + test: use test_must_be_empty F instead of test -z $(cat F) + + t1400: use test_must_be_empty + + t1410: use test_line_count + + t1512: use test_line_count + + Test cleanup. + + Will merge to 'master'. + + +* rs/use-skip-prefix-more (2019-11-27) 5 commits + (merged to 'next' on 2019-12-02 at a2124db23e) + + name-rev: use skip_prefix() instead of starts_with() + + push: use skip_prefix() instead of starts_with() + + shell: use skip_prefix() instead of starts_with() + + fmt-merge-msg: use skip_prefix() instead of starts_with() + + fetch: use skip_prefix() instead of starts_with() + + Code cleanup. + + Will merge to 'master'. + + +* sg/test-squelch-noise-in-commit-bulk (2019-11-27) 1 commit + (merged to 'next' on 2019-12-05 at 7819efee07) + + test-lib-functions: suppress a 'git rev-parse' error in 'test_commit_bulk' + + Code cleanup. + + Will merge to 'master'. + + +* ag/sequencer-continue-leakfix (2019-11-30) 1 commit + (merged to 'next' on 2019-12-05 at 923a6a7ab6) + + sequencer: fix a memory leak in sequencer_continue() + + Leakfix. + + Will merge to 'master'. + + +* bc/t9001-zsh-in-posix-emulation-mode (2019-11-30) 1 commit + (merged to 'next' on 2019-12-05 at d0ce4bcc90) + + t9001: avoid including non-trailing NUL bytes in variables + + Test portability fix. + + Will merge to 'master'. + + +* cs/store-packfiles-in-hashmap (2019-12-03) 1 commit + (merged to 'next' on 2019-12-05 at 887d5559bb) + + packfile.c: speed up loading lots of packfiles + + In a repository with many packfiles, the cost of the procedure that + avoids registering the same packfile twice was unnecessarily high + by using an inefficient search algorithm, which has been corrected. + + Will merge to 'master'. + + +* dd/time-reentrancy (2019-12-01) 3 commits + (merged to 'next' on 2019-12-05 at d0c91f4d1b) + + mingw: use {gm,local}time_s as backend for {gm,local}time_r + + archive-zip.c: switch to reentrant localtime_r + + date.c: switch to reentrant {gm,local}time_r + + Avoid gmtime() and localtime() and prefer their reentrant + counterparts. + + Will merge to 'master'. + + +* em/test-skip-regex-illseq (2019-11-30) 1 commit + (merged to 'next' on 2019-12-05 at 85c7940aeb) + + t4210: skip i18n tests that don't work on FreeBSD + + Test portability fix. + + Will merge to 'master'. + + +* hi/gpg-use-check-signature (2019-11-30) 1 commit + (merged to 'next' on 2019-12-05 at 35fc8e839a) + + gpg-interface: prefer check_signature() for GPG verification + + Hide lower-level verify_signed-buffer() API as a pure helper to + implement the public check_signature() function, in order to + encourage new callers to use the correct and more strict + validation. + + Will merge to 'master'. + + +* hi/grep-do-not-return-void (2019-11-30) 1 commit + (merged to 'next' on 2019-12-02 at 4409c73cfa) + + grep: don't return an expression from pcre2_free() + + Code cleanup. + + Will merge to 'master'. + + +* jk/lore-is-the-archive (2019-11-30) 2 commits + (merged to 'next' on 2019-12-02 at 603a2b0105) + + doc: replace public-inbox links with lore.kernel.org + + doc: recommend lore.kernel.org over public-inbox.org + (this branch is used by dl/lore-is-the-archive.) + + Doc update for the mailing list archiving and nntp service. + + Will merge to 'master'. + + +* jk/send-pack-check-negative-with-quick (2019-11-30) 1 commit + (merged to 'next' on 2019-12-02 at 2b01214601) + + send-pack: use OBJECT_INFO_QUICK to check negative objects + + Performance tweak on "git push" into a repository with many refs + that point at objects we have never heard of. + + Will merge to 'master'. + + +* sg/osx-force-gcc-9 (2019-11-29) 1 commit + (merged to 'next' on 2019-12-02 at 4916f80e5e) + + ci: build Git with GCC 9 in the 'osx-gcc' build job + + TravisCI update. Will merge to 'master'. * dl/pretty-reference (2019-11-20) 11 commits - - SubmittingPatches: use `--pretty=reference` - - pretty: implement 'reference' format - - pretty: add struct cmt_fmt_map::default_date_mode_type - - pretty: provide short date format - - t4205: cover `git log --reflog -z` blindspot - - pretty.c: inline initalize format_context - - revision: make get_revision_mark() return const pointer - - completion: complete `tformat:` pretty format - - SubmittingPatches: remove dq from commit reference - - pretty-formats.txt: use generic terms for hash - - SubmittingPatches: use generic terms for hash + (merged to 'next' on 2019-12-05 at 0972133ad2) + + SubmittingPatches: use `--pretty=reference` + + pretty: implement 'reference' format + + pretty: add struct cmt_fmt_map::default_date_mode_type + + pretty: provide short date format + + t4205: cover `git log --reflog -z` blindspot + + pretty.c: inline initalize format_context + + revision: make get_revision_mark() return const pointer + + completion: complete `tformat:` pretty format + + SubmittingPatches: remove dq from commit reference + + pretty-formats.txt: use generic terms for hash + + SubmittingPatches: use generic terms for hash "git log" family learned "--pretty=ref" that gives the name of a commit in the format that is often used to refer to it in log messages. - Will merge to 'next'. + Will merge to 'master'. * hw/doc-in-header (2019-11-18) 20 commits @@ -1032,47 +797,20 @@ of the repositories listed at * js/builtin-add-i-cmds (2019-12-01) 9 commits - - built-in add -i: offer the `quit` command - - built-in add -i: re-implement the `diff` command - - built-in add -i: implement the `patch` command - - built-in add -i: re-implement `add-untracked` in C - - built-in add -i: re-implement `revert` in C - - built-in add -i: implement the `update` command - - built-in add -i: prepare for multi-selection commands - - built-in add -i: allow filtering the modified files list - - add-interactive: make sure to release `rev.prune_data` - (this branch uses js/builtin-add-i.) + (merged to 'next' on 2019-12-05 at 30cfe5c15d) + + built-in add -i: offer the `quit` command + + built-in add -i: re-implement the `diff` command + + built-in add -i: implement the `patch` command + + built-in add -i: re-implement `add-untracked` in C + + built-in add -i: re-implement `revert` in C + + built-in add -i: implement the `update` command + + built-in add -i: prepare for multi-selection commands + + built-in add -i: allow filtering the modified files list + + add-interactive: make sure to release `rev.prune_data` "git add -i" that is getting rewritten in C has been extended to cover subcommands other than the "patch". - Will merge to 'next'. - - -* js/rebase-r-safer-label (2019-11-18) 2 commits - (merged to 'next' on 2019-11-21 at 791d51b0d7) - + rebase -r: let `label` generate safer labels - + rebase-merges: move labels' whitespace mangling into `label_oid()` - (this branch is used by dd/rebase-merge-reserves-onto-label.) - - A label used in the todo list that are generated by "git rebase - --rebase-merges" is used as a part of a refname; the logic to come - up with the label has been tightened to avoid names that cannot be - used as such. - - Will merge to 'master'. - - -* dd/rebase-merge-reserves-onto-label (2019-11-20) 1 commit - (merged to 'next' on 2019-11-21 at a6e4e5af0a) - + sequencer: handle rebase-merges for "onto" message - (this branch uses js/rebase-r-safer-label.) - - The logic to avoid duplicate label names generated by "git rebase - --rebase-merges" forgot that the machinery itself uses "onto" as a - label name, which must be avoided by auto-generated labels, which - has been corrected. - Will merge to 'master'. @@ -1128,6 +866,7 @@ of the repositories listed at + doc: reset: synchronize description + pathspec: add new function to parse file + parse-options.h: add new options `--pathspec-from-file`, `--pathspec-file-nul` + (this branch is used by am/pathspec-f-f-checkout and es/pathspec-f-f-grep.) A few commands learned to take the pathspec from the standard input or a named file, instead of taking it as the command @@ -1136,65 +875,6 @@ of the repositories listed at Will merge to 'master'. -* ec/fetch-mark-common-refs-trace2 (2019-11-20) 1 commit - (merged to 'next' on 2019-11-25 at c2b8e1546c) - + fetch: add trace2 instrumentation - - Trace2 annotation. - - Will merge to 'master'. - - -* ep/guard-kset-tar-headers (2019-11-07) 1 commit - (merged to 'next' on 2019-11-21 at 6c9574b01d) - + kset.h, tar.h: add missing header guard to prevent multiple inclusion - - Code clean-up. - - Will merge to 'master'. - - -* dl/t5520-cleanup (2019-11-21) 15 commits - (merged to 'next' on 2019-11-27 at 523d920acf) - + t5520: replace `! git` with `test_must_fail git` - + t5520: remove redundant lines in test cases - + t5520: replace $(cat ...) comparison with test_cmp - + t5520: don't put git in upstream of pipe - + t5520: test single-line files by git with test_cmp - + t5520: use test_cmp_rev where possible - + t5520: replace test -{n,z} with test-lib functions - + t5520: use test_line_count where possible - + t5520: remove spaces after redirect operator - + t5520: replace test -f with test-lib functions - + t5520: let sed open its own input - + t5520: use sq for test case names - + t5520: improve test style - + t: teach test_cmp_rev to accept ! for not-equals - + t0000: test multiple local assignment - - Test cleanup. - - Will merge to 'master'. - - -* js/builtin-add-i (2019-11-18) 9 commits - (merged to 'next' on 2019-11-21 at caefa55b89) - + built-in add -i: implement the `help` command - + built-in add -i: use color in the main loop - + built-in add -i: support `?` (prompt help) - + built-in add -i: show unique prefixes of the commands - + built-in add -i: implement the main loop - + built-in add -i: color the header in the `status` command - + built-in add -i: implement the `status` command - + diff: export diffstat interface - + Start to implement a built-in version of `git add --interactive` - (this branch is used by js/builtin-add-i-cmds.) - - The beginning of rewriting "git add -i" in C. - - Will merge to 'master'. - - * ra/rebase-i-more-options (2019-11-25) 7 commits (merged to 'next' on 2019-11-27 at e8a6d1e281) + rebase -i: finishing touches to --reset-author-date @@ -1212,11 +892,12 @@ of the repositories listed at * dl/submodule-set-url (2019-10-30) 1 commit - - submodule: teach set-url subcommand + (merged to 'next' on 2019-12-05 at a164eccad1) + + submodule: teach set-url subcommand "git submodule" learned a subcommand "set-url". - Will merge to 'next'. + Will merge to 'master'. * ag/sequencer-todo-updates (2019-11-25) 5 commits @@ -1226,6 +907,7 @@ of the repositories listed at + sequencer: move the code writing total_nr on the disk to a new function + sequencer: update `done_nr' when skipping commands in a todo list + sequencer: update `total_nr' when adding an item to a todo list + (this branch is used by ag/edit-todo-drop-check.) Reduce unnecessary reading of state variables back from the disk during sequencer operation. @@ -1233,27 +915,6 @@ of the repositories listed at Will merge to 'master'. -* mt/threaded-grep-in-object-store (2019-10-02) 11 commits - - grep: move driver pre-load out of critical section - - grep: re-enable threads in non-worktree case - - grep: protect packed_git [re-]initialization - - grep: allow submodule functions to run in parallel - - submodule-config: add skip_if_read option to repo_read_gitmodules() - - grep: replace grep_read_mutex by internal obj read lock - - object-store: allow threaded access to object reading - - replace-object: make replace operations thread-safe - - grep: fix racy calls in grep_objects() - - grep: fix race conditions at grep_submodule() - - grep: fix race conditions on userdiff calls - - Traditionally, we avoided threaded grep while searching in objects - (as opposed to files in the working tree) as accesses to the object - layer is not thread-safe. This limitation is getting lifted. - - Expecting a reroll. - cf. - - * jk/packfile-reuse-cleanup (2019-10-23) 9 commits (merged to 'next' on 2019-11-19 at 9683853939) + pack-objects: improve partial packfile reuse