From: Junio C Hamano Date: Thu, 7 Feb 2019 07:17:08 +0000 (-0800) Subject: What's cooking (2019/02 #02) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3c258e4845c323a1d1f847abea5dc39c65e69ab7;p=thirdparty%2Fgit.git What's cooking (2019/02 #02) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index b079b2dc8c..ae89228ce5 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 (Feb 2019, #01; Tue, 5) -X-master-at: 8feddda32cc50e928404788d7b9377c0b5f73f50 -X-next-at: b4d0f1c61aafd6cb5c3d9e6ee6bd99a036e3f21d +Subject: What's cooking in git.git (Feb 2019, #02; Wed, 6) +X-master-at: d62dad7a7dca3f6a65162bf0e52cdf6927958e78 +X-next-at: b571404aecccbd67727636813e633bcd481c0f3d -What's cooking in git.git (Feb 2019, #01; Tue, 5) +What's cooking in git.git (Feb 2019, #02; Wed, 6) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,11 +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. -A handful more topics have been merged to 'master' and 'next' -respectively. I have been hoping to keep this cycle short compared -to other recent cycles but there are a few smallish changes that we -should have in the upcoming release but are still not in 'next'. We -will see what happens. +An early preview of upcoming release 2.21-rc0 has been tagged with +the sixth batch of topic. Usually I try to keep topics in 'next' +for at least a week before merging them to 'master', in order to +keep 'master' from getting too unstable, but for this batch, many +topics spent only a day in 'next'. Hopefully the last minute bugs +will have the same, if not better, likelihood to get discovered and +fixed, whether the topics are in 'next' or '-rc0'. We'll see. You can find the changes described here in the integration branches of the repositories listed at @@ -26,341 +28,179 @@ of the repositories listed at -------------------------------------------------- [Graduated to "master"] -* ab/commit-graph-write-optim (2019-01-22) 1 commit - (merged to 'next' on 2019-01-29 at 17c894dfec) - + commit-graph write: use pack order when finding commits - (this branch is used by ab/commit-graph-write-progress and ds/commit-graph-format-v2.) - - The codepath to write out commit-graph has been optimized by - following the usual pattern of visiting objects in in-pack order. - - -* ab/commit-graph-write-progress (2019-01-23) 9 commits - (merged to 'next' on 2019-01-29 at e086b1cba6) - + commit-graph write: emit a percentage for all progress - + commit-graph write: add itermediate progress - + commit-graph write: remove empty line for readability - + commit-graph write: add more descriptive progress output - + commit-graph write: show progress for object search - + commit-graph write: more descriptive "writing out" output - + commit-graph write: add "Writing out" progress output - + commit-graph: don't call write_graph_chunk_extra_edges() unnecessarily - + commit-graph: rename "large edges" to "extra edges" - (this branch is used by ds/commit-graph-format-v2; uses ab/commit-graph-write-optim.) - - The codepath to show progress meter while writing out commit-graph - file has been improved. - - -* az/instaweb-py3-http-server (2019-01-28) 1 commit - (merged to 'next' on 2019-01-29 at 82f06b6774) - + git-instaweb: add Python builtin http.server support - - "git instaweb" learned to drive http.server that comes with - "batteries included" Python installation (both Python2 & 3). - - -* bp/checkout-new-branch-optim (2019-01-23) 2 commits - (merged to 'next' on 2019-01-29 at 89d690634d) - + checkout: fix regression in checkout -b on intitial checkout - + checkout: add test demonstrating regression with checkout -b on initial commit - - "git checkout -b [HEAD]" to create a new branch from the - current commit and check it out ought to be a no-op in the index - and the working tree in normal cases, but there are corner cases - that do require updates to the index and the working tree. Running - it immediately after "git clone --no-checkout" is one of these - cases that an earlier optimization kicked in incorrectly, which has - been fixed. - - -* cc/test-ref-store-typofix (2019-01-17) 1 commit - (merged to 'next' on 2019-01-29 at 0cd264f864) - + helper/test-ref-store: fix "new-sha1" vs "old-sha1" typo - - An obvious typo in an assertion error message has been fixed. - - -* ja/doc-style-fix (2019-01-23) 1 commit - (merged to 'next' on 2019-01-29 at 5b520a6fd3) - + doc: tidy asciidoc style - - Doc typo/stylo fixes. - - -* jk/add-ignore-errors-bit-assignment-fix (2019-01-17) 1 commit - (merged to 'next' on 2019-01-29 at a4ac7ccd4f) - + add: use separate ADD_CACHE_RENORMALIZE flag - - "git add --ignore-errors" did not work as advertised and instead - worked as an unintended synonym for "git add --renormalize", which - has been fixed. - - -* jk/attr-macro-fix (2019-01-22) 1 commit - (merged to 'next' on 2019-01-29 at 740df172e1) - + attr: do not mark queried macros as unset - - Asking "git check-attr" about a macro (e.g. "binary") on a specific - path did not work correctly, even though "git check-attr -a" listed - such a macro correctly. This has been corrected. - - -* jk/diff-cc-stat-fixes (2019-01-24) 6 commits - (merged to 'next' on 2019-01-29 at 8bd04f1749) - + combine-diff: treat --dirstat like --stat - + combine-diff: treat --summary like --stat - + combine-diff: treat --shortstat like --stat - + combine-diff: factor out stat-format mask - + diff: clear emitted_symbols flag after use - + t4006: resurrect commented-out tests - - "git diff --color-moved --cc --stat -p" did not work well due to - funny interaction between a bug in color-moved and the rest, which - has been fixed. - - -* js/abspath-part-inside-repo (2019-01-18) 1 commit - (merged to 'next' on 2019-01-29 at ac642158ec) - + abspath_part_inside_repo: respect core.ignoreCase - - On a case-insensitive filesystem, we failed to compare the part of - the path that is above the worktree directory in an absolute - pathname, which has been corrected. - - -* js/commit-graph-chunk-table-fix (2019-01-15) 3 commits - (merged to 'next' on 2019-01-29 at 65ea01d4f2) - + 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. - - -* js/filter-options-should-use-plain-int (2019-01-15) 1 commit - (merged to 'next' on 2019-01-18 at 6714547e6d) - + filter-options: expand scaled numbers - (this branch uses md/list-objects-filter-by-depth and sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.) - - Update the protocol message specification to allow only the limited - use of scaled quantities. This is ensure potential compatibility - issues will not go out of hand. - - -* js/mingw-unc-path-w-backslashes (2019-01-18) 2 commits - (merged to 'next' on 2019-01-29 at 3adc177c1e) - + mingw: special-case arguments to `sh` - + mingw (t5580): document bug when cloning from backslashed UNC paths - - In Git for Windows, "git clone \\server\share\path" etc. that uses - UNC paths from command line had bad interaction with its shell - emulation. - - -* js/t6042-timing-fix (2019-01-17) 1 commit - (merged to 'next' on 2019-01-29 at 9543c96249) - + t6042: work around speed optimization on Windows - - Test update. - - -* js/test-git-installed (2019-01-22) 1 commit - (merged to 'next' on 2019-01-29 at bab6eabb20) - + tests: explicitly use `test-tool.exe` on Windows - - Test fix for Windows. - - -* jt/fetch-v2-sideband (2019-01-17) 5 commits - (merged to 'next' on 2019-01-29 at c8c6f11f77) - + tests: define GIT_TEST_SIDEBAND_ALL - + {fetch,upload}-pack: sideband v2 fetch response - + sideband: reverse its dependency on pkt-line - + pkt-line: introduce struct packet_writer - + Merge branch 'ms/packet-err-check' into jt/fetch-v2-sideband - (this branch uses ms/packet-err-check.) - - "git fetch" and "git upload-pack" learned to send all exchange over - the sideband channel while talking the v2 protocol. - - -* jt/get-reference-with-commit-graph (2018-12-28) 1 commit - (merged to 'next' on 2019-01-18 at bfc4eb9411) - + revision: use commit graph in get_reference() - (this branch uses sb/more-repo-in-api; is tangled with js/filter-options-should-use-plain-int and md/list-objects-filter-by-depth.) - - Micro-optimize the code that prepares commit objects to be walked - by "git rev-list" when the commit-graph is available. - - -* jt/namespaced-ls-refs-fix (2019-01-18) 1 commit - (merged to 'next' on 2019-01-29 at 049530f499) - + ls-refs: filter refs using namespace-stripped name - - Fix namespace support in protocol v2. - - -* ld/git-p4-shelve-update-fix (2019-01-18) 2 commits - (merged to 'next' on 2019-01-29 at 02e8752ec8) - + git-p4: handle update of moved/copied files when updating a shelve - + git-p4: add failing test for shelved CL update involving move/copy - - "git p4" failed to update a shelved change when there were moved - files, which has been corrected. - - -* md/list-objects-filter-by-depth (2019-01-15) 4 commits - + tree:: skip some trees even when collecting omits - + list-objects-filter: teach tree:# how to handle >0 - + Merge branch 'nd/the-index' into md/list-objects-filter-by-depth - + Merge branch 'sb/more-repo-in-api' into md/list-objects-filter-by-depth - (this branch is used by js/filter-options-should-use-plain-int; uses sb/more-repo-in-api; is tangled with jt/get-reference-with-commit-graph.) - +* ab/diff-tree-doc-fix (2019-02-04) 1 commit + (merged to 'next' on 2019-02-05 at 123f48fa2e) + + diff-tree doc: correct & remove wrong documentation -* ms/packet-err-check (2019-01-02) 2 commits - + pack-protocol.txt: accept error packets in any context - + Use packet_reader instead of packet_read_line - (this branch is used by jt/fetch-v2-sideband.) + Doc fix. - Error checking of data sent over the pack-protocol has been - revamped so that error packets are always diagnosed properly. +* bc/fetch-pack-clear-alternate-shallow (2019-02-06) 2 commits + (merged to 'next' on 2019-02-06 at 2ebc2c9f87) + + fetch-pack: clear alternate shallow in one more place + (merged to 'next' on 2019-02-05 at 14392fb6b2) + + fetch-pack: clear alternate shallow when complete -* nd/fetch-compact-update (2019-01-27) 1 commit - (merged to 'next' on 2019-01-29 at b78e8841b0) - + fetch: prefer suffix substitution in compact fetch.output + "git fetch" over protocol v2 that needs to make a second connection + to backfill tags did not clear a variable that holds shallow + repository information correctly, leading to an access of freed + piece of memory. - "git fetch" output cleanup. +* br/commit-tree-fully-spelled-gpg-sign-option (2019-01-22) 2 commits + (merged to 'next' on 2019-02-05 at a0a1e30471) + + commit-tree: add missing --gpg-sign flag + + t7510: invoke git as part of &&-chain -* ph/pack-objects-mutex-fix (2019-01-28) 2 commits - (merged to 'next' on 2019-01-29 at 7c886f6c33) - + pack-objects: merge read_lock and lock in packing_data struct - + pack-objects: move read mutex to packing_data struct + The documentation of "git commit-tree" said that the command + understands "--gpg-sign" in addition to "-S", but the command line + parser did not know about the longhand, which has been corrected. - "git pack-objects" incorrectly used uninitialized mutex, which has - been corrected. +* ds/push-sparse-tree-walk (2019-01-17) 5 commits + (merged to 'next' on 2019-02-05 at 9fd04c84d6) + + pack-objects: create GIT_TEST_PACK_SPARSE + + pack-objects: create pack.useSparse setting + + revision: implement sparse algorithm + + list-objects: consume sparse tree walk + + revision: add mark_tree_uninteresting_sparse -* pw/no-editor-in-rebase-i-implicit (2019-01-28) 1 commit - (merged to 'next' on 2019-01-29 at 9d06993725) - + implicit interactive rebase: don't run sequence editor + "git pack-objects" learned another algorithm to compute the set of + objects to send, that trades the resulting packfile off to save + traversal cost to favor small pushes. - When GIT_SEQUENCE_EDITOR is set, the command was incorrectly - started when modes of "git rebase" that implicitly uses the - machinery for the interactive rebase are run, which has been - corrected. +* dt/cat-file-batch-ambiguous (2019-01-31) 2 commits + (merged to 'next' on 2019-02-05 at 121d162945) + + t1512: test ambiguous cat-file --batch and --batch-output + + Do not print 'dangling' for cat-file in case of ambiguity -* sb/more-repo-in-api (2018-12-28) 23 commits - + t/helper/test-repository: celebrate independence from the_repository - + path.h: make REPO_GIT_PATH_FUNC repository agnostic - + commit: prepare free_commit_buffer and release_commit_memory for any repo - + commit-graph: convert remaining functions to handle any repo - + submodule: don't add submodule as odb for push - + submodule: use submodule repos for object lookup - + pretty: prepare format_commit_message to handle arbitrary repositories - + commit: prepare logmsg_reencode to handle arbitrary repositories - + commit: prepare repo_unuse_commit_buffer to handle any repo - + commit: prepare get_commit_buffer to handle any repo - + commit-reach: prepare in_merge_bases[_many] to handle any repo - + commit-reach: prepare get_merge_bases to handle any repo - + commit-reach.c: allow get_merge_bases_many_0 to handle any repo - + commit-reach.c: allow remove_redundant to handle any repo - + commit-reach.c: allow merge_bases_many to handle any repo - + commit-reach.c: allow paint_down_to_common to handle any repo - + commit: allow parse_commit* to handle any repo - + object: parse_object to honor its repository argument - + object-store: prepare has_{sha1, object}_file to handle any repo - + object-store: prepare read_object_file to deal with any repo - + object-store: allow read_object_file_extended to read from any repo - + packfile: allow has_packed_and_bad to handle arbitrary repositories - + sha1_file: allow read_object to read objects in arbitrary repositories - (this branch is used by js/filter-options-should-use-plain-int, jt/get-reference-with-commit-graph and md/list-objects-filter-by-depth.) - - The in-core repository instances are passed through more codepaths. - - -* sg/object-as-type-commit-graph-fix (2019-01-27) 1 commit - (merged to 'next' on 2019-01-29 at cc714a044a) - + object_as_type: initialize commit-graph-related fields of 'struct commit' - - The commit-graph facility did not work when in-core objects that - are promoted from unknown type to commit (e.g. a commit that is - accessed via a tag that refers to it) were involved, which has been - corrected. + "git cat-file --batch" reported a dangling symbolic link by + mistake, when it wanted to report that a given name is ambiguous. -* sg/obstack-cast-function-type-fix (2019-01-17) 1 commit - (merged to 'next' on 2019-01-29 at 568cafa7f4) - + compat/obstack: fix -Wcast-function-type warnings +* en/rebase-merge-on-sequencer (2019-01-07) 8 commits + (merged to 'next' on 2019-02-05 at 88823d7c86) + + rebase: implement --merge via the interactive machinery + + rebase: define linearization ordering and enforce it + + git-legacy-rebase: simplify unnecessary triply-nested if + + git-rebase, sequencer: extend --quiet option for the interactive machinery + + am, rebase--merge: do not overlook --skip'ed commits with post-rewrite + + t5407: add a test demonstrating how interactive handles --skip differently + + rebase: fix incompatible options error message + + rebase: make builtin and legacy script error messages the same - The compat/obstack code had casts that -Wcast-function-type - compilation option found questionable. + "git rebase --merge" as been reimplemented by reusing the internal + machinery used for "git rebase -i". -* sg/strbuf-addbuf-cocci (2019-01-27) 1 commit - (merged to 'next' on 2019-01-29 at a9f7279d38) - + strbuf.cocci: suggest strbuf_addbuf() to add one strbuf to an other +* jk/add-ignore-errors-bit-assignment-fix (2019-02-06) 1 commit + (merged to 'next' on 2019-02-06 at 46cf370d8b) + + add_to_index(): convert forgotten HASH_RENORMALIZE check - Cocci rule update. + A hotfix to an incomplete fix made earlier. --------------------------------------------------- -[New Topics] -* ab/diff-tree-doc-fix (2019-02-04) 1 commit - (merged to 'next' on 2019-02-05 at 123f48fa2e) - + diff-tree doc: correct & remove wrong documentation +* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits + (merged to 'next' on 2019-02-05 at 2b372ed6e9) + + docs/config: clarify "text property" in core.eol + + doc/gitattributes: clarify "autocrlf overrides eol" - Doc fix. + Documentation around core.crlf has been updated. - Will merge to 'master'. +* jk/loose-object-cache-oid (2019-01-08) 11 commits + (merged to 'next' on 2019-02-05 at 5cbc954aa5) + + prefer "hash mismatch" to "sha1 mismatch" + + sha1-file: avoid "sha1 file" for generic use in messages + + sha1-file: prefer "loose object file" to "sha1 file" in messages + + sha1-file: drop has_sha1_file() + + convert has_sha1_file() callers to has_object_file() + + sha1-file: convert pass-through functions to object_id + + sha1-file: modernize loose header/stream functions + + sha1-file: modernize loose object file functions + + http: use struct object_id instead of bare sha1 + + update comment references to sha1_object_info() + + sha1-file: fix outdated sha1 comment references -* bc/fetch-pack-clear-alternate-shallow (2019-02-04) 1 commit - (merged to 'next' on 2019-02-05 at 14392fb6b2) - + fetch-pack: clear alternate shallow when complete + Code clean-up. - "git fetch" over protocol v2 that needs to make a second connection - to backfill tags did not clear a variable that holds shallow - repository information correctly, leading to an access of freed - piece of memory. - Will merge to 'master'. +* jk/unused-parameter-cleanup (2019-01-24) 8 commits + (merged to 'next' on 2019-02-05 at 213400362c) + + convert: drop path parameter from actual conversion functions + + convert: drop len parameter from conversion checks + + config: drop unused parameter from maybe_remove_section() + + show_date_relative(): drop unused "tz" parameter + + column: drop unused "opts" parameter in item_length() + + create_bundle(): drop unused "header" parameter + + apply: drop unused "def" parameter from find_name_gnu() + + match-trees: drop unused path parameter from score functions + Code cleanup. -* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit - - http: cast result to FILE * - Variants of BSD define fileno(fh) as a macro, breaking a program - that passes a "void *" to it. +* js/rebase-am (2019-01-18) 4 commits + (merged to 'next' on 2019-02-05 at cb92db8ecf) + + built-in rebase: call `git am` directly + + rebase: teach `reset_head()` to optionally skip the worktree + + rebase: avoid double reflog entry when switching branches + + rebase: move `reset_head()` into a better spot - Expecting a reroll. - cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca> + Instead of going through "git-rebase--am" scriptlet to use the "am" + backend, the built-in version of "git rebase" learned to drive the + "am" backend directly. -* en/combined-all-paths (2019-02-04) 1 commit - - log,diff-tree: add --combined-all-names option +* js/vsts-ci (2019-02-06) 22 commits + (merged to 'next' on 2019-02-06 at fe1a5e9d5c) + + test-date: drop unused parameter to getnanos() + (merged to 'next' on 2019-02-05 at 7297a734c7) + + ci: parallelize testing on Windows + + ci: speed up Windows phase + + tests: optionally skip bin-wrappers/ + + t0061: workaround issues with --with-dashes and RUNTIME_PREFIX + + tests: add t/helper/ to the PATH with --with-dashes + + mingw: try to work around issues with the test cleanup + + tests: include detailed trace logs with --write-junit-xml upon failure + + tests: avoid calling Perl just to determine file sizes + + README: add a build badge (status of the Azure Pipelines build) + + mingw: be more generous when wrapping up the setitimer() emulation + + ci: use git-sdk-64-minimal build artifact + + ci: add a Windows job to the Azure Pipelines definition + + Add a build definition for Azure DevOps + + ci/lib.sh: add support for Azure Pipelines + + tests: optionally write results as JUnit-style .xml + + test-date: add a subcommand to measure times in shell scripts + + ci: use a junction on Windows instead of a symlink + + ci: inherit --jobs via MAKEFLAGS in run-build-and-tests + + ci/lib.sh: encapsulate Travis-specific things + + ci: rename the library of common functions + + travis: fix skipping tagged releases - Output from "diff --cc" did not show the original paths when the - merge involved renames. A new option adds the paths in the - original trees to the output. + Prepare to run test suite on Azure Pipeline. - Expecting a reroll. - cf. +* km/init-doc-typofix (2019-01-31) 1 commit + (merged to 'next' on 2019-02-05 at ee90a62a1c) + + init docs: correct a punctuation typo -* js/rebase-i-redo-exec-fix (2019-02-05) 1 commit - - Revert "rebase: introduce a shortcut for --reschedule-failed-exec" + Docfix. - For "rebase -i --reschedule-failed-exec", we do not want the "-y" - shortcut after all. - Waiting for a clarification for the log message. - cf. +* lt/date-human (2019-01-29) 5 commits + (merged to 'next' on 2019-02-05 at f2850c9fc0) + + Add `human` date format tests. + + Add `human` format to test-tool + + Add 'human' date format documentation + + Replace the proposed 'auto' mode with 'auto:' + + Add 'human' date format + A new date format "--date=human" that morphs its output depending + on how far the time is from the current time has been introduced. + "--date=auto" can be used to use this new format when the output is + going to the pager or to the terminal and otherwise the default + format. * ma/doc-diff-usage-fix (2019-02-04) 1 commit @@ -371,8 +211,6 @@ of the repositories listed at top-level of the working tree did not show the usage string correctly, which has been fixed. - Will merge to 'master'. - * nd/commit-doc (2019-02-04) 1 commit (merged to 'next' on 2019-02-05 at 07b341767e) @@ -380,8 +218,6 @@ of the repositories listed at Doc update. - Will merge to 'master'. - * nd/help-align-command-desc (2019-01-31) 1 commit (merged to 'next' on 2019-02-05 at 8339c1a46e) @@ -390,7 +226,32 @@ of the repositories listed at Output from "git help" was not correctly aligned, which has been fixed. - Will merge to 'master'. + +* nd/the-index-final (2019-01-24) 11 commits + (merged to 'next' on 2019-02-05 at 71b37c09a8) + + cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch + + read-cache.c: remove the_* from index_has_changes() + + merge-recursive.c: remove implicit dependency on the_repository + + merge-recursive.c: remove implicit dependency on the_index + + sha1-name.c: remove implicit dependency on the_index + + read-cache.c: replace update_index_if_able with repo_& + + read-cache.c: kill read_index() + + checkout: avoid the_index when possible + + repository.c: replace hold_locked_index() with repo_hold_locked_index() + + notes-utils.c: remove the_repository references + + grep: use grep_opt->repo instead of explict repo argument + + The assumption to work on the single "in-core index" instance has + been reduced from the library-ish part of the codebase. + + +* pw/rebase-x-sanity-check (2019-01-29) 1 commit + (merged to 'next' on 2019-02-05 at 9f087a617a) + + rebase -x: sanity check command + + "git rebase -x $cmd" did not reject multi-line command, even though + the command is incapable of handling such a command. It now is + rejected upfront. * rj/sparse-flags (2019-02-05) 2 commits @@ -401,7 +262,13 @@ of the repositories listed at Use of the sparse tool got easier to customize from the command line to help developers. - Will merge to 'master'. + +* sb/submodule-abort-update-upon-config-failure (2019-01-18) 1 commit + (merged to 'next' on 2019-02-05 at 85da48a9a5) + + git-submodule: abort if core.worktree could not be set correctly + + "git submodule update" learned to abort early when core.worktree + for the submodule is not set correctly to prevent spreading damage. * sg/travis-osx-brew-breakage-workaround (2019-02-04) 1 commit @@ -415,7 +282,16 @@ of the repositories listed at have worked around a breakage by recent updates to homebrew, which has fixed itself already). - Will merge to 'master'. + +* sg/travis-specific-cc (2019-01-17) 4 commits + (merged to 'next' on 2019-02-05 at 3ecb3b6755) + + travis-ci: build with the right compiler + + travis-ci: switch to Xcode 10.1 macOS image + + travis-ci: don't be '--quiet' when running the tests + + .gitignore: ignore external debug symbols from GCC on macOS + + The travis CI scripts have been corrected to build Git with the + compiler(s) of our choice. * sh/submodule-summary-abbrev-fix (2019-02-04) 1 commit @@ -427,8 +303,6 @@ of the repositories listed at has been improved to let "rev-parse --short" scale the length of the abbreviation with the size of the repository. - Will merge to 'master'. - * sl/const (2019-02-04) 1 commit (merged to 'next' on 2019-02-05 at a085045a37) @@ -436,8 +310,6 @@ of the repositories listed at Code cleanup. - Will merge to 'master'. - * ss/describe-dirty-in-the-right-directory (2019-02-04) 2 commits (merged to 'next' on 2019-02-05 at e4a3303e12) @@ -449,97 +321,145 @@ of the repositories listed at worktree specified by the user by mistake, which has been corrected. - Will merge to 'master'. + +* tb/test-lint-sed-options (2019-01-28) 1 commit + (merged to 'next' on 2019-02-05 at dec383d823) + + test-lint: only use only sed [-n] [-e command] [-f command_file] + + The test lint learned to catch non-portable "sed" options. + + +* tb/utf-16-le-with-explicit-bom (2019-01-31) 1 commit + (merged to 'next' on 2019-02-05 at 43ac83e06e) + + Support working-tree-encoding "UTF-16LE-BOM" + + A new encoding UTF-16LE-BOM has been invented to force encoding to + UTF-16 with BOM in little endian byte order, which cannot be directly + generated by using iconv. + + +* tt/bisect-in-c (2019-01-02) 7 commits + (merged to 'next' on 2019-02-05 at 1e5e00d24e) + + bisect--helper: `bisect_start` shell function partially in C + + bisect--helper: `get_terms` & `bisect_terms` shell function in C + + bisect--helper: `bisect_next_check` shell function in C + + bisect--helper: `check_and_set_terms` shell function in C + + wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() + + bisect--helper: `bisect_write` shell function in C + + bisect--helper: `bisect_reset` shell function in C + + More code in "git bisect" has been rewritten in C. -------------------------------------------------- -[Cooking] +[New Topics] -* km/init-doc-typofix (2019-01-31) 1 commit - (merged to 'next' on 2019-02-05 at ee90a62a1c) - + init docs: correct a punctuation typo +* dl/complete-submodule-absorbgitdirs (2019-02-06) 1 commit + (merged to 'next' on 2019-02-06 at c4e0cd535a) + + completion: complete git submodule absorbgitdirs + + Command-line completion (in contrib/) learned to tab-complete the + "git submodule absorbgitdirs" subcommand. + + Will cook in 'next'. - Docfix. + +* ld/git-p4-remove-flakey-test (2019-02-06) 1 commit + (merged to 'next' on 2019-02-06 at 0100bce8b6) + + git-p4: remove ticket expiry test + + A flakey "p4" test has been removed. Will merge to 'master'. -* ds/commit-graph-format-v2 (2019-01-29) 8 commits - - SQUASH : misnamed variables and style fix - - commit-graph: test verifying a corrupt v2 header - - commit-graph: implement file format version 2 - - commit-graph: add --version= option - - commit-graph: create new version flags - - commit-graph: collapse parameters into flags - - commit-graph: return with errors during write - - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2 +* nd/checkout-noisy-unmerge (2019-02-06) 2 commits + (merged to 'next' on 2019-02-06 at 7fe9bd5b4e) + + checkout: count and print -m paths separately + + checkout: update count-checkouts messages - Introduce version 2 of the commit-graph format to correct - deficiency in the initial version. + "git checkout [] " started reporting the number + of paths that have got updated recently, but the same messages were + given when "git checkout -m " to unresolve conflicts that + have just been resolved. The message now reports these unresolved + paths separately from the paths that are checked out from the index. + Will merge to 'master'. -* ds/coverage-prove (2019-01-29) 1 commit - - Makefile: add coverage-prove target - A new target "coverage-prove" to run the coverage test under - "prove" has been added. +* jt/test-protocol-version (2019-02-06) 9 commits + - remote-curl: in v2, fill credentials if needed + - t5552: compensate for v2 filtering ref adv. + - tests: fix protocol version for overspecifications + - t5700: only run with protocol version 1 + - t5512: compensate for v0 only sending HEAD symrefs + - t5503: fix overspecification of trace expectation + - tests: always test fetch of unreachable with v0 + - tests: define GIT_TEST_PROTOCOL_VERSION + - Merge branch 'js/protocol-advertise-multi' into jt/test-protocol-version + (this branch uses js/protocol-advertise-multi.) - Will merge to 'next'. + Help developers by making it easier to run most of the tests under + different versions of over-the-wire protocols. +-------------------------------------------------- +[Cooking] -* br/commit-tree-fully-spelled-gpg-sign-option (2019-01-22) 2 commits - (merged to 'next' on 2019-02-05 at a0a1e30471) - + commit-tree: add missing --gpg-sign flag - + t7510: invoke git as part of &&-chain +* dm/some-stdio-functions-are-macro-on-freebsd (2019-02-01) 1 commit + - http: cast result to FILE * - The documentation of "git commit-tree" said that the command - understands "--gpg-sign" in addition to "-S", but the command line - parser did not know about the longhand, which has been corrected. + Variants of BSD define fileno(fh) as a macro, breaking a program + that passes a "void *" to it. - Will merge to 'master'. + Expecting a reroll. + cf. <49B9198C-53E5-42BD-8834-B1EDEB3332CB@usask.ca> -* dt/cat-file-batch-ambiguous (2019-01-31) 2 commits - (merged to 'next' on 2019-02-05 at 121d162945) - + t1512: test ambiguous cat-file --batch and --batch-output - + Do not print 'dangling' for cat-file in case of ambiguity +* en/combined-all-paths (2019-02-04) 1 commit + - log,diff-tree: add --combined-all-names option - "git cat-file --batch" reported a dangling symbolic link by - mistake, when it wanted to report that a given name is ambiguous. + Output from "diff --cc" did not show the original paths when the + merge involved renames. A new option adds the paths in the + original trees to the output. - Will merge to 'master'. + Expecting a reroll. + cf. -* sb/submodule-abort-update-upon-config-failure (2019-01-18) 1 commit - (merged to 'next' on 2019-02-05 at 85da48a9a5) - + git-submodule: abort if core.worktree could not be set correctly +* js/rebase-i-redo-exec-fix (2019-02-06) 1 commit + (merged to 'next' on 2019-02-06 at 9f99bee768) + + Revert "rebase: introduce a shortcut for --reschedule-failed-exec" - "git submodule update" learned to abort early when core.worktree - for the submodule is not set correctly to prevent spreading damage. + For "rebase -i --reschedule-failed-exec", we do not want the "-y" + shortcut after all. Will merge to 'master'. -* tb/test-lint-sed-options (2019-01-28) 1 commit - (merged to 'next' on 2019-02-05 at dec383d823) - + test-lint: only use only sed [-n] [-e command] [-f command_file] - - The test lint learned to catch non-portable "sed" options. +* ds/commit-graph-format-v2 (2019-01-29) 8 commits + - SQUASH : misnamed variables and style fix + - commit-graph: test verifying a corrupt v2 header + - commit-graph: implement file format version 2 + - commit-graph: add --version= option + - commit-graph: create new version flags + - commit-graph: collapse parameters into flags + - commit-graph: return with errors during write + - Merge branch 'bc/sha-256' into ds/commit-graph-format-v2 - Will merge to 'master'. + Introduce version 2 of the commit-graph format to correct + deficiency in the initial version. -* tb/utf-16-le-with-explicit-bom (2019-01-31) 1 commit - (merged to 'next' on 2019-02-05 at 43ac83e06e) - + Support working-tree-encoding "UTF-16LE-BOM" +* ds/coverage-prove (2019-01-29) 1 commit + (merged to 'next' on 2019-02-06 at 0fc57228ec) + + Makefile: add coverage-prove target - A new encoding UTF-16LE-BOM has been invented to force encoding to - UTF-16 with BOM in little endian byte order, which cannot be directly - generated by using iconv. + A new target "coverage-prove" to run the coverage test under + "prove" has been added. Will merge to 'master'. -* jh/trace2 (2019-02-01) 15 commits +* jh/trace2 (2019-02-06) 15 commits - trace2: add for_each macros to clang-format - trace2: t/helper/test-trace2, t0210.sh, t0211.sh, t0212.sh - trace2:data: add subverb for rebase @@ -558,24 +478,7 @@ of the repositories listed at A more structured way to obtain execution trace has been added. - Still needs some fix-ups. - cf. - - -* jk/unused-parameter-cleanup (2019-01-24) 8 commits - (merged to 'next' on 2019-02-05 at 213400362c) - + convert: drop path parameter from actual conversion functions - + convert: drop len parameter from conversion checks - + config: drop unused parameter from maybe_remove_section() - + show_date_relative(): drop unused "tz" parameter - + column: drop unused "opts" parameter in item_length() - + create_bundle(): drop unused "header" parameter - + apply: drop unused "def" parameter from find_name_gnu() - + match-trees: drop unused path parameter from score functions - - Code cleanup. - - Will merge to 'master'. + Will merge to 'next'. * sx/evolve (2019-01-27) 8 commits @@ -591,27 +494,6 @@ of the repositories listed at The beginning of "hg evolve" mimicry. -* jk/autocrlf-overrides-eol-doc (2019-01-29) 2 commits - (merged to 'next' on 2019-02-05 at 2b372ed6e9) - + docs/config: clarify "text property" in core.eol - + doc/gitattributes: clarify "autocrlf overrides eol" - - Documentation around core.crlf has been updated. - - Will merge to 'master'. - - -* pw/rebase-x-sanity-check (2019-01-29) 1 commit - (merged to 'next' on 2019-02-05 at 9f087a617a) - + rebase -x: sanity check command - - "git rebase -x $cmd" did not reject multi-line command, even though - the command is incapable of handling such a command. It now is - rejected upfront. - - Will merge to 'master'. - - * br/blame-ignore (2019-01-18) 3 commits - blame: add a config option to mark ignored lines - blame: add the ability to ignore commits and their changes @@ -660,6 +542,8 @@ of the repositories listed at Update the implementation of pack-redundant for performance in a repository with many packfiles. + Will merge to 'next'. + * nd/config-move-to (2019-01-14) 7 commits - config.h: fix hdr-check warnings @@ -673,19 +557,6 @@ of the repositories listed at Needs review. -* sg/travis-specific-cc (2019-01-17) 4 commits - (merged to 'next' on 2019-02-05 at 3ecb3b6755) - + travis-ci: build with the right compiler - + travis-ci: switch to Xcode 10.1 macOS image - + travis-ci: don't be '--quiet' when running the tests - + .gitignore: ignore external debug symbols from GCC on macOS - - The travis CI scripts have been corrected to build Git with the - compiler(s) of our choice. - - Will merge to 'master'. - - * ma/clear-repository-format (2019-01-23) 2 commits - setup: fix memory leaks with `struct repository_format` - setup: free old value before setting `work_tree` @@ -696,97 +567,15 @@ of the repositories listed at cf. <20190124001450.GR423984@genre.crustytoothpaste.net> -* nd/the-index-final (2019-01-24) 11 commits - (merged to 'next' on 2019-02-05 at 71b37c09a8) - + cache.h: flip NO_THE_INDEX_COMPATIBILITY_MACROS switch - + read-cache.c: remove the_* from index_has_changes() - + merge-recursive.c: remove implicit dependency on the_repository - + merge-recursive.c: remove implicit dependency on the_index - + sha1-name.c: remove implicit dependency on the_index - + read-cache.c: replace update_index_if_able with repo_& - + read-cache.c: kill read_index() - + checkout: avoid the_index when possible - + repository.c: replace hold_locked_index() with repo_hold_locked_index() - + notes-utils.c: remove the_repository references - + grep: use grep_opt->repo instead of explict repo argument - - The assumption to work on the single "in-core index" instance has - been reduced from the library-ish part of the codebase. - - Will merge to 'master'. - - * wh/author-committer-ident-config (2019-02-04) 1 commit - - config: allow giving separate author and committer idents + (merged to 'next' on 2019-02-06 at 6ab8bfa199) + + config: allow giving separate author and committer idents Four new configuration variables {author,committer}.{name,email} have been introduced to override user.{name,email} in more specific cases. - -* js/rebase-am (2019-01-18) 4 commits - (merged to 'next' on 2019-02-05 at cb92db8ecf) - + built-in rebase: call `git am` directly - + rebase: teach `reset_head()` to optionally skip the worktree - + rebase: avoid double reflog entry when switching branches - + rebase: move `reset_head()` into a better spot - - Instead of going through "git-rebase--am" scriptlet to use the "am" - backend, the built-in version of "git rebase" learned to drive the - "am" backend directly. - - Will merge to 'master'. - - -* tt/bisect-in-c (2019-01-02) 7 commits - (merged to 'next' on 2019-02-05 at 1e5e00d24e) - + bisect--helper: `bisect_start` shell function partially in C - + bisect--helper: `get_terms` & `bisect_terms` shell function in C - + bisect--helper: `bisect_next_check` shell function in C - + bisect--helper: `check_and_set_terms` shell function in C - + wrapper: move is_empty_file() and rename it as is_empty_or_missing_file() - + bisect--helper: `bisect_write` shell function in C - + bisect--helper: `bisect_reset` shell function in C - - More code in "git bisect" has been rewritten in C. - - Will merge to 'master'. - - -* jk/loose-object-cache-oid (2019-01-08) 11 commits - (merged to 'next' on 2019-02-05 at 5cbc954aa5) - + prefer "hash mismatch" to "sha1 mismatch" - + sha1-file: avoid "sha1 file" for generic use in messages - + sha1-file: prefer "loose object file" to "sha1 file" in messages - + sha1-file: drop has_sha1_file() - + convert has_sha1_file() callers to has_object_file() - + sha1-file: convert pass-through functions to object_id - + sha1-file: modernize loose header/stream functions - + sha1-file: modernize loose object file functions - + http: use struct object_id instead of bare sha1 - + update comment references to sha1_object_info() - + sha1-file: fix outdated sha1 comment references - - Code clean-up. - - Will merge to 'master'. - - -* lt/date-human (2019-01-29) 5 commits - (merged to 'next' on 2019-02-05 at f2850c9fc0) - + Add `human` date format tests. - + Add `human` format to test-tool - + Add 'human' date format documentation - + Replace the proposed 'auto' mode with 'auto:' - + Add 'human' date format - - A new date format "--date=human" that morphs its output depending - on how far the time is from the current time has been introduced. - "--date=auto" can be used to use this new format when the output is - going to the pager or to the terminal and otherwise the default - format. - - Will merge to 'master'. + Will cook in 'next'. * ds/midx-expire-repack (2019-01-27) 10 commits @@ -808,21 +597,6 @@ of the repositories listed at Comments? -* ds/push-sparse-tree-walk (2019-01-17) 5 commits - (merged to 'next' on 2019-02-05 at 9fd04c84d6) - + pack-objects: create GIT_TEST_PACK_SPARSE - + pack-objects: create pack.useSparse setting - + revision: implement sparse algorithm - + list-objects: consume sparse tree walk - + revision: add mark_tree_uninteresting_sparse - - "git pack-objects" learned another algorithm to compute the set of - objects to send, that trades the resulting packfile off to save - traversal cost to favor small pushes. - - Will merge to 'master'. - - * tg/checkout-no-overlay (2019-02-04) 9 commits (merged to 'next' on 2019-02-04 at 9968bcf4fb) + revert "checkout: introduce checkout.overlayMode config" @@ -847,10 +621,11 @@ of the repositories listed at * dl/merge-cleanup-scissors-fix (2019-01-27) 4 commits - - merge: add scissors line on merge conflict - - merge: cleanup messages like commit - - t7600: clean up 'merge --squash c3 with c7' test - - commit: extract cleanup_mode functions to sequencer + (merged to 'next' on 2019-02-06 at f4fe5d759a) + + merge: add scissors line on merge conflict + + merge: cleanup messages like commit + + t7600: clean up 'merge --squash c3 with c7' test + + commit: extract cleanup_mode functions to sequencer The list of conflicted paths shown in the editor while concluding a conflicted merge was shown above the scissors line when the @@ -858,23 +633,24 @@ of the repositories listed at out just like the list of updated paths and other information to help the user explain the merge better. - Will merge to 'next'. + Will cook in 'next'. * aw/pretty-trailers (2019-01-29) 7 commits - - pretty: add support for separator option in %(trailers) - - strbuf: separate callback for strbuf_expand:ing literals - - pretty: add support for "valueonly" option in %(trailers) - - pretty: allow showing specific trailers - - pretty: single return path in %(trailers) handling - - pretty: allow %(trailers) options with explicit value - - doc: group pretty-format.txt placeholders descriptions + (merged to 'next' on 2019-02-06 at b7e5437702) + + pretty: add support for separator option in %(trailers) + + strbuf: separate callback for strbuf_expand:ing literals + + pretty: add support for "valueonly" option in %(trailers) + + pretty: allow showing specific trailers + + pretty: single return path in %(trailers) handling + + pretty: allow %(trailers) options with explicit value + + doc: group pretty-format.txt placeholders descriptions The %(trailers) formatter in "git log --format=..." now allows to optionally pick trailers selectively by keyword, show only values, etc. - Comments? + Will cook in 'next'. * jn/unknown-index-extensions (2018-11-21) 2 commits @@ -887,23 +663,6 @@ of the repositories listed at Expecting a reroll. -* en/rebase-merge-on-sequencer (2019-01-07) 8 commits - (merged to 'next' on 2019-02-05 at 88823d7c86) - + rebase: implement --merge via the interactive machinery - + rebase: define linearization ordering and enforce it - + git-legacy-rebase: simplify unnecessary triply-nested if - + git-rebase, sequencer: extend --quiet option for the interactive machinery - + am, rebase--merge: do not overlook --skip'ed commits with post-rewrite - + t5407: add a test demonstrating how interactive handles --skip differently - + rebase: fix incompatible options error message - + rebase: make builtin and legacy script error messages the same - - "git rebase --merge" as been reimplemented by reusing the internal - machinery used for "git rebase -i". - - Will merge to 'master'. - - * dl/remote-save-to-push (2018-12-11) 1 commit - remote: add --save-to-push option to git remote set-url @@ -916,25 +675,24 @@ of the repositories listed at * js/protocol-advertise-multi (2018-12-28) 1 commit - protocol: advertise multiple supported versions + (this branch is used by jt/test-protocol-version.) The transport layer has been updated so that the protocol version used can be negotiated between the parties, by the initiator listing the protocol versions it is willing to talk, and the other side choosing from one of them. - Is this ready for 'next'? - -* js/smart-http-detect-remote-error (2019-01-07) 3 commits - - remote-curl: die on server-side errors - - remote-curl: tighten "version 2" check for smart-http - - remote-curl: refactor smart-http discovery +* js/smart-http-detect-remote-error (2019-02-06) 3 commits + (merged to 'next' on 2019-02-06 at ec1a6f67c1) + + t5551: test server-side ERR packet + + remote-curl: tighten "version 2" check for smart-http + + remote-curl: refactor smart-http discovery Some errors from the other side coming over smart HTTP transport were not noticed, which has been corrected. - This needs to be rebased on top of a more recent 'master' that has - ms/packet-err-check. + Will merge to 'master'. * nb/branch-show-other-worktrees-head (2019-02-01) 3 commits @@ -947,44 +705,16 @@ of the repositories listed at '+', similar to the way the currently checked out branch is shown with '*' in front. + The top one probably deserves retitling. The second one is of dubious value. -* js/vsts-ci (2019-01-29) 21 commits - (merged to 'next' on 2019-02-05 at 7297a734c7) - + ci: parallelize testing on Windows - + ci: speed up Windows phase - + tests: optionally skip bin-wrappers/ - + t0061: workaround issues with --with-dashes and RUNTIME_PREFIX - + tests: add t/helper/ to the PATH with --with-dashes - + mingw: try to work around issues with the test cleanup - + tests: include detailed trace logs with --write-junit-xml upon failure - + tests: avoid calling Perl just to determine file sizes - + README: add a build badge (status of the Azure Pipelines build) - + mingw: be more generous when wrapping up the setitimer() emulation - + ci: use git-sdk-64-minimal build artifact - + ci: add a Windows job to the Azure Pipelines definition - + Add a build definition for Azure DevOps - + ci/lib.sh: add support for Azure Pipelines - + tests: optionally write results as JUnit-style .xml - + test-date: add a subcommand to measure times in shell scripts - + ci: use a junction on Windows instead of a symlink - + ci: inherit --jobs via MAKEFLAGS in run-build-and-tests - + ci/lib.sh: encapsulate Travis-specific things - + ci: rename the library of common functions - + travis: fix skipping tagged releases - - Prepare to run test suite on Azure Pipeline. - - Will merge to 'master'. - - * du/branch-show-current (2018-10-26) 1 commit - branch: introduce --show-current display option "git branch" learned a new subcommand "--show-current". - I am personally not yet quite convinced if this is worth pursuing. + Will merge to 'next'. * mk/use-size-t-in-zlib (2018-10-15) 1 commit @@ -1067,11 +797,7 @@ of the repositories listed at "git stash" rewritten in C. - On hold, waiting for a response - cf. - I personally do not mind "oops, this was wrong and I am too lazy to - redo the history to clean it up" too much, but waiting briefly to - give the final chance to do so. + Will merge to 'next'. * pw/add-p-select (2018-07-26) 4 commits