{"thread":{"id":"51549","subject":"[ANNOUNCE] Git v2.23.0-rc0","startedAt":"2019-07-29T21:49:58Z","lastAt":"2019-08-02T18:35:31Z","messageCount":27,"participants":["Junio C Hamano","Johannes Schindelin","Jeff King","Jonathan Nieder","Ariadne Conill","Bryan Turner","Martin Ågren","Todd Zullinger"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"379556","messageId":"xmqqh874tssp.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":null,"subject":"[ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-07-29T21:49:42Z","receivedAt":"2019-07-29T21:49:58Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"An early preview release Git v2.23.0-rc0 is now available for\ntesting at the usual places. It is comprised of 420 non-merge\ncommits since v2.22.0, contributed by 62 people, 23 of which are\nnew faces.\n\nThe tarballs are found at:\n\n https://www.kernel.org/pub/software/scm/git/testing/\n\nThe following public repositories all have a copy of the\n'v2.23.0-rc0' tag and the 'master' branch that the tag points at:\n\n url = https://kernel.googlesource.com/pub/scm/git/git\n url = git://repo.or.cz/alt-git.git\n url = https://github.com/gitster/git\n\nNew contributors whose contributions weren't in v2.22.0 are as follows.\nWelcome to the Git development community!\n\n Ariadne Conill, Barret Rhoden, Ben Avison, Daniel Ferreira, Doug\n Ilijev, Dr. Adam Nielsen, Jakub Wilk, John Lin, Matheus Tavares,\n Mazo, Andrey, Michael Osipov, Michael Platings, Miguel Ojeda,\n Mike Mueller, Morian Sonnet, Quentin Nerden, Robert Morgan,\n Simon Williams, Steven Roberts, Tigran Mkrtchyan, Varun Naik,\n Vishal Verma, and Xin Li.\n\nReturning contributors who helped this release are as follows.\nThanks for your continued support.\n\n Ævar Arnfjörð Bjarmason, Beat Bolli, Boxuan Li, Carlo Marcelo\n Arenas Belón, Cesar Eduardo Barros, Chris Mayo, Christian\n Couder, Denton Liu, Derrick Stolee, Dimitriy Ryazantcev,\n Edmundo Carmona Antoranz, Elijah Newren, Emily Shaffer, Eric\n Wong, Felipe Contreras, Jeff Hostetler, Jeff King, Johannes\n Schindelin, Johannes Sixt, Jonathan Tan, Josh Steadmon, Junio\n C Hamano, Karsten Blees, Marc-André Lureau, Martin Ågren,\n Matthew DeVore, Mike Hommey, Nguyễn Thái Ngọc Duy, Nickolai\n Belakovski, Paolo Bonzini, Philip Oakley, Phillip Wood, Ramsay\n Jones, René Scharfe, Rohit Ashiwal, Stephen Boyd, SZEDER Gábor,\n Taylor Blau, and Thomas Gummerer.\n\n----------------------------------------------------------------\n\nGit 2.23 Release Notes (draft)\n==============================\n\nUpdates since v2.22\n-------------------\n\nBackward compatibility note\n\n * The \"--base\" option of \"format-patch\" computed the patch-ids for\n prerequisite patches in an unstable way, which has been updated to\n compute in a way that is compatible with \"git patch-id --stable\".\n\n\nUI, Workflows & Features\n\n * The \"git fast-export/import\" pair has been taught to handle commits\n with log messages in encoding other than UTF-8 better.\n\n * In recent versions of Git, per-worktree refs are exposed in\n refs/worktrees// hierarchy, which means that worktree names\n must be a valid refname component. The code now sanitizes the names\n given to worktrees, to make sure these refs are well-formed.\n\n * \"git merge\" learned \"--quit\" option that cleans up the in-progress\n merge while leaving the working tree and the index still in a mess.\n\n * \"git format-patch\" learns a configuration to set the default for\n its --notes= option.\n\n * The code to show args with potential typo that cannot be\n interpreted as a commit-ish has been improved.\n\n * \"git clone --recurse-submodules\" learned to set up the submodules\n to ignore commit object names recorded in the superproject gitlink\n and instead use the commits that happen to be at the tip of the\n remote-tracking branches from the get-go, by passing the new\n \"--remote-submodules\" option.\n\n * The pattern \"git diff/grep\" use to extract funcname and words\n boundary for Matlab has been extend to cover Octave, which is more\n or less equivalent.\n\n * \"git help git\" was hard to discover (well, at least for some\n people).\n\n * The pattern \"git diff/grep\" use to extract funcname and words\n boundary for Rust has been added.\n\n * \"git status\" can be told a non-standard default value for the\n \"--[no-]ahead-behind\" option with a new configuration variable\n status.aheadBehind.\n\n * \"git fetch\" and \"git pull\" reports when a fetch results in\n non-fast-forward updates to let the user notice unusual situation.\n The commands learned \"--no-shown-forced-updates\" option to disable\n this safety feature.\n\n * Two new commands \"git switch\" and \"git restore\" are introduced to\n split \"checking out a branch to work on advancing its history\" and\n \"checking out paths out of the index and/or a tree-ish to work on\n advancing the current history\" out of the single \"git checkout\"\n command.\n\n * \"git branch --list\" learned to always output the detached HEAD as\n the first item (when the HEAD is detached, of course), regardless\n of the locale.\n\n * The conditional inclusion mechanism learned to base the choice on\n the branch the HEAD currently is on.\n\n * \"git rev-list --objects\" learned with \"--no-object-names\" option to\n squelch the path to the object that is used as a grouping hint for\n pack-objects.\n\n * A new tag.gpgSign configuration variable turns \"git tag -a\" into\n \"git tag -s\".\n\n * \"git multi-pack-index\" learned expire and repack subcommands.\n\n * \"git blame\" learned to \"ignore\" commits in the history, whose\n effects (as well as their presence) get ignored.\n\n * \"git cherry-pick/revert\" learned a new \"--skip\" action.\n\n * The tips of refs from the alternate object store can be used as\n starting point for reachability computation now.\n\n * Extra blank lines in \"git status\" output have been reduced.\n\n * The commits in a repository can be described by multiple\n commit-graph files now, which allows the commit-graph files to be\n updated incrementally.\n\n * The \"git log\" command learns to issue a warning when log.mailmap\n configuration is not set and --[no-]mailmap option is not used, to\n prepare users for future versions of Git that uses the mailmap by\n default.\n\n * \"git range-diff\" output has been tweaked for easier identification\n of which part of what file the patch shown is about.\n\n\nPerformance, Internal Implementation, Development Support etc.\n\n * Update supporting parts of \"git rebase\" to remove code that should\n no longer be used.\n\n * Developer support to emulate unsatisfied prerequisites in tests to\n ensure that the remainer of the tests still succeeds when tests\n with prerequisites are skipped.\n\n * \"git update-server-info\" learned not to rewrite the file with the\n same contents.\n\n * The way of specifying the path to find dynamic libraries at runtime\n has been simplified. The old default to pass -R/path/to/dir has been\n replaced with the new default to pass -Wl,-rpath,/path/to/dir,\n which is the more recent GCC uses. Those who need to build with an\n old GCC can still use \"CC_LD_DYNPATH=-R\"\n\n * Prepare use of reachability index in topological walker that works\n on a range (A..B).\n\n * A new tutorial targetting specifically aspiring git-core\n developers has been added.\n\n * Auto-detect how to tell HP-UX aCC where to use dynamically linked\n libraries from at runtime.\n\n * \"git mergetool\" and its tests now spawn fewer subprocesses.\n\n * Dev support update to help tracing out tests.\n\n * Support to build with MSVC has been updated.\n\n * \"git fetch\" that grabs from a group of remotes learned to run the\n auto-gc only once at the very end.\n\n * A handful of Windows build patches have been upstreamed.\n\n * The code to read state files used by the sequencer machinery for\n \"git status\" has been made more robust against a corrupt or stale\n state files.\n\n * \"git for-each-ref\" with multiple patterns have been optimized.\n\n * The tree-walk API learned to pass an in-core repository\n instance throughout more codepaths.\n\n * When one step in multi step cherry-pick or revert is reset or\n committed, the command line prompt script failed to notice the\n current status, which has been improved.\n\n * Many GIT_TEST_* environment variables control various aspects of\n how our tests are run, but a few followed \"non-empty is true, empty\n or unset is false\" while others followed the usual \"there are a few\n ways to spell true, like yes, on, etc., and also ways to spell\n false, like no, off, etc.\" convention.\n\n * Adjust the dir-iterator API and apply it to the local clone\n optimization codepath.\n\n * We have been trying out a few language features outside c89; the\n coding guidelines document did not talk about them and instead had\n a blanket ban against them.\n (merge cc0c42975a jc/post-c89-rules-doc later to maint).\n\n * A test helper has been introduced to optimize preparation of test\n repositories with many simple commits, and a handful of test\n scripts have been updated to use it.\n\n\nFixes since v2.22\n-----------------\n\n * A relative pathname given to \"git init --template= \"\n ought to be relative to the directory \"git init\" gets invoked in,\n but it instead was made relative to the repository, which has been\n corrected.\n (merge e1df7fe43f nd/init-relative-template-fix later to maint).\n\n * \"git worktree add\" used to fail when another worktree connected to\n the same repository was corrupt, which has been corrected.\n (merge 105df73e71 nd/corrupt-worktrees later to maint).\n\n * The ownership rule for the file descriptor to fast-import remote\n backend was mixed up, leading to unrelated file descriptor getting\n closed, which has been fixed.\n (merge 3203566a71 mh/import-transport-fd-fix later to maint).\n\n * A \"merge -c\" instruction during \"git rebase --rebase-merges\" should\n give the user a chance to edit the log message, even when there is\n otherwise no need to create a new merge and replace the existing\n one (i.e. fast-forward instead), but did not. Which has been\n corrected.\n\n * Code cleanup and futureproof.\n (merge 31f5256c82 ds/object-info-for-prefetch-fix later to maint).\n\n * More parameter validation.\n (merge de99eb0c24 es/grep-require-name-when-needed later to maint).\n\n * \"git update-server-info\" used to leave stale packfiles in its\n output, which has been corrected.\n (merge e941c48d49 ew/server-info-remove-crufts later to maint).\n\n * The server side support for \"git fetch\" used to show incorrect\n value for the HEAD symbolic ref when the namespace feature is in\n use, which has been corrected.\n (merge 533e088250 jk/HEAD-symref-in-xfer-namespaces later to maint).\n\n * \"git am -i --resolved\" segfaulted after trying to see a commit as\n if it were a tree, which has been corrected.\n (merge 7663e438c5 jk/am-i-resolved-fix later to maint).\n\n * \"git bundle verify\" needs to see if prerequisite objects exist in\n the receiving repository, but the command did not check if we are\n in a repository upfront, which has been corrected.\n (merge 3bbbe467f2 js/bundle-verify-require-object-store later to maint).\n\n * \"git merge --squash\" is designed to update the working tree and the\n index without creating the commit, and this cannot be countermanded\n by adding the \"--commit\" option; the command now refuses to work\n when both options are given.\n (merge 1d14d0c994 vv/merge-squash-with-explicit-commit later to maint).\n\n * The data collected by fsmonitor was not properly written back to\n the on-disk index file, breaking t7519 tests occasionally, which\n has been corrected.\n (merge b5a8169752 js/fsmonitor-unflake later to maint).\n\n * Update to Unicode 12.1 width table.\n (merge 5817f9caa3 bb/unicode-12.1-reiwa later to maint).\n\n * The command line to invoke a \"git cat-file\" command from inside\n \"git p4\" was not properly quoted to protect a caret and running a\n broken command on Windows, which has been corrected.\n (merge c3f2358de3 mm/p4-unshelve-windows-fix later to maint).\n\n * \"git request-pull\" learned to warn when the ref we ask them to pull\n from in the local repository and in the published repository are\n different.\n (merge 0454220d66 pb/request-pull-verify-remote-ref later to maint).\n\n * When creating a partial clone, the object filtering criteria is\n recorded for the origin of the clone, but this incorrectly used a\n hardcoded name \"origin\" to name that remote; it has been corrected\n to honor the \"--origin \" option.\n (merge 1c4a9f9114 xl/record-partial-clone-origin later to maint).\n\n * \"git fetch\" into a lazy clone forgot to fetch base objects that are\n necessary to complete delta in a thin packfile, which has been\n corrected.\n (merge 810e19322d jt/partial-clone-missing-ref-delta-base later to maint).\n\n * The filter_data used in the list-objects-filter (which manages a\n lazily sparse clone repository) did not use the dynamic array API\n correctly---'nr' is supposed to point at one past the last element\n of the array in use. This has been corrected.\n (merge 7140600e2e md/list-objects-filter-memfix later to maint).\n\n * The description about slashes in gitignore patterns (used to\n indicate things like \"anchored to this level only\" and \"only\n matches directories\") has been revamped.\n (merge 1a58bad014 an/ignore-doc-update later to maint).\n\n * The URL decoding code has been updated to avoid going past the end\n of the string while parsing %-- sequence.\n (merge d37dc239a4 md/url-parse-harden later to maint).\n\n * The list of for-each like macros used by clang-format has been\n updated.\n (merge fc7e03aace mo/clang-format-for-each-update later to maint).\n\n * \"git branch --list\" learned to show branches that are checked out\n in other worktrees connected to the same repository prefixed with\n '+', similar to the way the currently checked out branch is shown\n with '*' in front.\n (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint).\n\n * Code restructuring during 2.20 period broke fetching tags via\n \"import\" based transports.\n (merge f80d922355 fc/fetch-with-import-fix later to maint).\n\n * The commit-graph file is now part of the \"files that the runtime\n may keep open file descriptors on, all of which would need to be\n closed when done with the object store\", and the file descriptor to\n an existing commit-graph file now is closed before \"gc\" finalizes a\n new instance to replace it.\n (merge 2d511cfc0b ds/close-object-store later to maint).\n\n * \"git checkout -p\" needs to selectively apply a patch in reverse,\n which did not work well.\n (merge 2bd69b9024 pw/add-p-recount later to maint).\n\n * Code clean-up to avoid signed integer wraparounds during binary search.\n (merge 568a05c5ec rs/avoid-overflow-in-midpoint-computation later to maint).\n\n * \"git interpret-trailers\" always treated '#' as the comment\n character, regardless of core.commentChar setting, which has been\n corrected.\n (merge 29c83fc23f jk/trailers-use-config later to maint).\n\n * \"git stash show 23\" used to work, but no more after getting\n rewritten in C; this regression has been corrected.\n (merge 63b50c8ffe tg/stash-ref-by-index-fix later to maint).\n\n * \"git rebase --abort\" used to leave refs/rewritten/ when concluding\n \"git rebase -r\", which has been corrected.\n (merge d559f502c5 pw/rebase-abort-clean-rewritten later to maint).\n\n * An incorrect list of options was cached after command line\n completion failed (e.g. trying to complete a command that requires\n a repository outside one), which has been corrected.\n (merge 69702523af nd/completion-no-cache-failure later to maint).\n\n * The code to parse scaled numbers out of configuration files has\n been made more robust and also easier to follow.\n (merge 39c575c969 rs/config-unit-parsing later to maint).\n\n * The codepath to compute delta islands used to spew progress output\n without giving the callers any way to squelch it, which has been\n fixed.\n (merge bdbdf42f8a jk/delta-islands-progress-fix later to maint).\n\n * Protocol capabilities that go over wire should never be translated,\n but it was incorrectly marked for translation, which has been\n corrected. The output of protocol capabilities for debugging has\n been tweaked a bit.\n\n * Use \"Erase in Line\" CSI sequence that is already used in the editor\n support to clear cruft in the progress output.\n (merge 5b12e3123b sg/rebase-progress later to maint).\n\n * \"git submodule foreach\" did not protect command line options passed\n to the command to be run in each submodule correctly, when the\n \"--recursive\" option was in use.\n (merge 30db18b148 ms/submodule-foreach-fix later to maint).\n\n * The configuration variable rebase.rescheduleFailedExec should be\n effective only while running an interactive rebase and should not\n affect anything when running an non-interactive one, which was not\n the case. This has been corrected.\n (merge 906b63942a js/rebase-reschedule-applies-only-to-interactive later to maint).\n\n * The \"git clone\" documentation refers to command line options in its\n description in the short form; they have been replaced with long\n forms to make them more recognisable.\n (merge bfc8c84ed5 qn/clone-doc-use-long-form later to maint).\n\n * Generation of pack bitmaps are now disabled when .keep files exist,\n as these are mutually exclusive features.\n (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint).\n\n * \"git rm\" to resolve a conflicted path leaked an internal message\n \"needs merge\" before actually removing the path, which was\n confusing. This has been corrected.\n (merge b2b1f615ce jc/denoise-rm-to-resolve later to maint).\n\n * \"git stash --keep-index\" did not work correctly on paths that have\n been removed, which has been fixed.\n (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).\n\n * Window 7 update ;-)\n (merge eb7c786314 js/mingw-spawn-with-spaces-in-path later to maint).\n\n * A codepath that reads from GPG for signed object verification read\n past the end of allocated buffer, which has been fixed.\n (merge 64c45dc72e sr/gpg-interface-stop-at-the-end later to maint).\n\n * \"git clean\" silently skipped a path when it cannot lstat() it; now\n it gives a warning.\n (merge b09364c47a js/clean-report-too-long-a-path later to maint).\n\n * \"git push --atomic\" that goes over the transport-helper (namely,\n the smart http transport) failed to prevent refs to be pushed when\n it can locally tell that one of the ref update will fail without\n having to consult the other end, which has been corrected.\n (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint).\n\n * The internal diff machinery can be made to read out of bounds while\n looking for --funcion-context line in a corner case, which has been\n corrected.\n (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).\n\n * Other code cleanup, docfix, build fix, etc.\n (merge f547101b26 es/git-debugger-doc later to maint).\n (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint).\n (merge 0108f47eb3 sw/git-p4-unshelve-branched-files later to maint).\n (merge 9df8f734fd cm/send-email-document-req-modules later to maint).\n (merge afc3bf6eb1 ab/hash-object-doc later to maint).\n (merge 1fde99cfc7 po/doc-branch later to maint).\n (merge 459842e1c2 dl/config-alias-doc later to maint).\n (merge 5d137fc2c7 cb/fsmonitor-intfix later to maint).\n (merge 921d49be86 rs/copy-array later to maint).\n (merge cc8d872e69 js/t3404-typofix later to maint).\n (merge 729a9b558b cb/mkstemps-uint-type-fix later to maint).\n (merge 9dae4fe79f js/gcc-8-and-9 later to maint).\n (merge ed33bd8f30 js/t0001-case-insensitive later to maint).\n (merge dfa880e336 jw/gitweb-sample-update later to maint).\n (merge e532a90a9f sg/t5551-fetch-smart-error-is-translated later to maint).\n (merge 8d45ad8c29 jt/t5551-test-chunked later to maint).\n (merge 1a64e07d23 sg/git-C-empty-doc later to maint).\n (merge 37a2e35395 sg/ci-brew-gcc-workaround later to maint).\n (merge 24df0d49c4 js/trace2-signo-typofix later to maint).\n (merge fbec05c210 cc/test-oidmap later to maint).\n (merge 7926cee904 di/readme-markup-fix later to maint).\n (merge 02638d1e11 vn/xmmap-gently later to maint).\n (merge f7bf24d4dd rm/gpg-program-doc-fix later to maint).\n (merge 3aef54e8b8 js/unmap-before-ext-diff later to maint).\n\n----------------------------------------------------------------\n\nChanges since v2.22.0 are as follows:\n\nAriadne Conill (3):\n log: add warning for unspecified log.mailmap setting\n documentation: mention --no-use-mailmap and log.mailmap false setting\n tests: defang pager tests by explicitly disabling the log.mailmap warning\n\nBarret Rhoden (8):\n fsck: rename and touch up init_skiplist()\n Move oidset_parse_file() to oidset.c\n blame: use a helper function in blame_chunk()\n blame: add the ability to ignore commits and their changes\n blame: add config options for the output of ignored or unblamable lines\n blame: optionally track line fingerprints during fill_blame_origin()\n blame: use the fingerprint heuristic to match ignored lines\n blame: add a test to cover blame_coalesce()\n\nBeat Bolli (2):\n unicode: update the width tables to Unicode 12.1\n grep: print the pcre2_jit_on value\n\nBen Avison (1):\n clone: add `--remote-submodules` flag\n\nBoxuan Li (2):\n userdiff: add Octave\n userdiff: fix grammar and style issues\n\nCarlo Marcelo Arenas Belón (3):\n fsmonitor: avoid signed integer overflow / infinite loop\n wrapper: avoid undefined behaviour in macOS\n trace2: correct typo in technical documentation\n\nCesar Eduardo Barros (1):\n mingw: embed a manifest to trick UAC into Doing The Right Thing\n\nChris Mayo (1):\n send-email: update documentation of required Perl modules\n\nChristian Couder (7):\n t/helper: add test-oidmap.c\n t: add t0016-oidmap.sh\n oidmap: use sha1hash() instead of static hash() function\n test-hashmap: remove 'hash' command\n doc: improve usage string in MyFirstContribution\n test-oidmap: remove 'add' subcommand\n t0016: add 'remove' subcommand test\n\nDaniel Ferreira (1):\n dir-iterator: add tests for dir-iterator API\n\nDenton Liu (5):\n git-format-patch.txt: document --no-notes option\n format-patch: teach format.notes config option\n config: learn the \"onbranch:\" includeIf condition\n config/alias.txt: change \" and ' to `\n config/alias.txt: document alias accepting non-command first word\n\nDerrick Stolee (50):\n commit-graph: fix the_repository reference\n revision: use generation for A..B --topo-order queries\n revision: keep topo-walk free of unintersting commits\n sha1-file: split OBJECT_INFO_FOR_PREFETCH\n repack: refactor pack deletion for future use\n Docs: rearrange subcommands for multi-pack-index\n multi-pack-index: prepare for 'expire' subcommand\n midx: simplify computation of pack name lengths\n midx: refactor permutation logic and pack sorting\n multi-pack-index: implement 'expire' subcommand\n multi-pack-index: prepare 'repack' subcommand\n midx: implement midx_repack()\n multi-pack-index: test expire while adding packs\n midx: add test that 'expire' respects .keep files\n t5319-multi-pack-index.sh: test batch size zero\n commit-graph: return with errors during write\n commit-graph: collapse parameters into flags\n commit-graph: remove Future Work section\n commit-graph: create write_commit_graph_context\n commit-graph: extract fill_oids_from_packs()\n commit-graph: extract fill_oids_from_commit_hex()\n commit-graph: extract fill_oids_from_all_packs()\n commit-graph: extract count_distinct_commits()\n commit-graph: extract copy_oids_to_commits()\n commit-graph: extract write_commit_graph_file()\n commit-graph: use raw_object_store when closing\n packfile: close commit-graph in close_all_packs\n packfile: rename close_all_packs to close_object_store\n commit-graph: document commit-graph chains\n commit-graph: prepare for commit-graph chains\n commit-graph: rename commit_compare to oid_compare\n commit-graph: load commit-graph chains\n commit-graph: add base graphs chunk\n commit-graph: rearrange chunk count logic\n commit-graph: write commit-graph chains\n commit-graph: add --split option to builtin\n commit-graph: merge commit-graph chains\n commit-graph: allow cross-alternate chains\n commit-graph: expire commit-graph files\n commit-graph: create options for split files\n commit-graph: verify chains with --shallow mode\n commit-graph: clean up chains after flattened write\n commit-graph: test octopus merges with --split\n commit-graph: test --split across alternate without --split\n commit-graph: normalize commit-graph filenames\n commit-graph: test verify across alternates\n fetch: add --[no-]show-forced-updates argument\n fetch: warn about forced updates in branch listing\n pull: add --[no-]show-forced-updates passthrough\n t5319: use 'test-tool path-utils' instead of 'ls -l'\n\nDimitriy Ryazantcev (1):\n l10n: localizable upload progress messages\n\nDoug Ilijev (1):\n README: fix rendering of text in angle brackets\n\nDr. Adam Nielsen (1):\n gitignore.txt: make slash-rules more readable\n\nEdmundo Carmona Antoranz (1):\n builtin/merge.c - cleanup of code in for-cycle that tests strategies\n\nElijah Newren (5):\n t9350: fix encoding test to actually test reencoding\n fast-import: support 'encoding' commit header\n fast-export: avoid stripping encoding header if we cannot reencode\n fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8\n fast-export: do automatic reencoding of commit messages only if requested\n\nEmily Shaffer (7):\n documentation: add tutorial for first contribution\n documentation: add anchors to MyFirstContribution\n grep: fail if call could output and name is null\n doc: hint about GIT_DEBUGGER in CodingGuidelines\n doc: add some nit fixes to MyFirstContribution\n rev-list: teach --no-object-names to enable piping\n transport-helper: enforce atomic in push_refs_with_push\n\nEric Wong (3):\n update-server-info: avoid needless overwrites\n server-info: do not list unlinked packs\n repack: disable bitmaps-by-default if .keep files exist\n\nFelipe Contreras (5):\n t5801 (remote-helpers): cleanup refspec stuff\n t5801 (remote-helpers): add test to fetch tags\n fetch: trivial cleanup\n fetch: make the code more understandable\n fetch: fix regression with transport helpers\n\nJakub Wilk (1):\n doc: don't use git.kernel.org as example gitweb URL\n\nJeff Hostetler (13):\n cache-tree/blame: avoid reusing the DEBUG constant\n msvc: mark a variable as non-const\n msvc: do not re-declare the timespec struct\n msvc: define ftello()\n msvc: fix detect_msys_tty()\n msvc: update Makefile to allow for spaces in the compiler path\n status: add status.aheadbehind setting\n status: warn when a/b calculation takes too long\n status: ignore status.aheadbehind in porcelain formats\n msvc: support building Git using MS Visual C++\n msvc: add a compile-time flag to allow detailed heap debugging\n msvc: do not pretend to support all signals\n msvc: ignore .dll and incremental compile output\n\nJeff King (50):\n cmd_{read,write}_tree: rename \"unused\" variable that is used\n builtin: consistently pass cmd_* prefix to parse_options\n submodule: drop unused prefix parameter from some functions\n clone: drop dest parameter from copy_alternates()\n read-cache: drop unused parameter from threaded load\n wt-status: drop unused status parameter\n mktree: drop unused length parameter\n name-rev: drop unused parameters from is_better_name()\n pack-objects: drop unused rev_info parameters\n receive-pack: drop unused \"commands\" from prepare_shallow_update()\n remove_all_fetch_refspecs(): drop unused \"remote\" parameter\n rev-list: drop unused void pointer from finish_commit()\n show-branch: drop unused parameter from show_independent()\n verify-commit: simplify parameters to run_gpg_verify()\n help_unknown_ref(): duplicate collected refnames\n help_unknown_ref(): check for refname ambiguity\n upload-pack: strip namespace from symref data\n am: simplify prompt response handling\n am: read interactive input from stdin\n am: drop tty requirement for --interactive\n am: fix --interactive HEAD tree resolution\n interpret-trailers: load default config\n describe: fix accidental oid/hash type-punning\n upload-pack: rename a \"sha1\" variable to \"oid\"\n pack-bitmap-write: convert some helpers to use object_id\n pack-objects: convert packlist_find() to use object_id\n pack-objects: convert locate_object_entry_hash() to object_id\n object: convert lookup_unknown_object() to use object_id\n object: convert lookup_object() to use object_id\n object: convert internal hash_obj() to object_id\n object: convert create_object() to use object_id\n khash: drop broken oid_map typedef\n khash: rename kh_oid_t to kh_oid_set\n delta-islands: convert island_marks khash to use oids\n pack-bitmap: convert khash_sha1 maps into kh_oid_map\n khash: drop sha1-specific map types\n khash: rename oid helper functions\n hash.h: move object_id definition from cache.h\n hashmap: convert sha1hash() to oidhash()\n delta-islands: respect progress flag\n blame: drop some unused function parameters\n object-store.h: move for_each_alternate_ref() from transport.h\n check_everything_connected: assume alternate ref tips are valid\n test-lib: introduce test_commit_bulk\n t5310: increase the number of bitmapped commits\n t3311: use test_commit_bulk\n t5702: use test_commit_bulk\n t5703: use test_commit_bulk\n t6200: use test_commit_bulk\n xdiff: clamp function context indices in post-image\n\nJohannes Schindelin (32):\n Drop unused git-rebase--am.sh\n t3400: stop referring to the scripted rebase\n .gitignore: there is no longer a built-in `git-rebase--interactive`\n sequencer: the `am` and `rebase--interactive` scripts are gone\n rebase: fold git-rebase--common into the -p backend\n bisect--helper: verify HEAD could be parsed before continuing\n fill_stat_cache_info(): prepare for an fsmonitor fix\n mark_fsmonitor_valid(): mark the index as changed if needed\n bundle verify: error out if called without an object database\n poll (mingw): allow compiling with GCC 8 and DEVELOPER=1\n kwset: allow building with GCC 8\n winansi: simplify loading the GetCurrentConsoleFontEx() function\n config: avoid calling `labs()` on too-large data type\n t3404: fix a typo\n mingw: fix a typo in the msysGit-specific section\n Mark .bat files as requiring CR/LF endings\n t0001 (mingw): do not expect a specific order of stdout/stderr\n obstack: fix compiler warning\n mingw: replace mingw_startup() hack\n msvc: fix dependencies of compat/msvc.c\n t0001: fix on case-insensitive filesystems\n msvc: avoid debug assertion windows in Debug Mode\n mingw: enable stack smashing protector\n mingw: get pw_name in UTF-8 format\n mingw: use Unicode functions explicitly\n rebase --am: ignore rebase.rescheduleFailedExec\n mingw: fix possible buffer overrun when calling `GetUserNameW()`\n diff: munmap() file contents before running external diff\n mingw: support spawning programs containing spaces in their names\n clean: show an error message when the path is too long\n rebase: fix white-space\n git: mark cmd_rebase as requiring a worktree\n\nJohannes Sixt (5):\n userdiff: two simplifications of patterns for rust\n t7610-mergetool: do not place pipelines headed by `yes` in subshells\n t7610-mergetool: use test_cmp instead of test $(cat file) = $txt\n mergetool: dissect strings with shell variable magic instead of `expr`\n mergetool: use shell variable magic instead of `awk`\n\nJohn Lin (1):\n status: remove the empty line after hints\n\nJonathan Tan (5):\n t5616: refactor packfile replacement\n index-pack: prefetch missing REF_DELTA bases\n t5616: use correct flag to check object is missing\n t5616: cover case of client having delta base\n t5551: test usage of chunked encoding explicitly\n\nJosh Steadmon (1):\n trace2: correct trace2 field name documentation\n\nJunio C Hamano (13):\n The first batch after 2.22\n The second batch\n The third batch\n The fourth batch\n The fifth batch\n transport-helper: avoid var decl in for () loop control\n rm: resolving by removal is not a warning-worthy event\n CodingGuidelines: spell out post-C89 rules\n The sixth batch\n The seventh batch\n Flush fixes up to the third batch post 2.22.0\n Merge fixes made on the 'master' front\n Git 2.23-rc0\n\nKarsten Blees (2):\n gettext: always use UTF-8 on native Windows\n mingw: initialize HOME on startup\n\nMarc-André Lureau (1):\n userdiff: add built-in pattern for rust\n\nMartin Ågren (1):\n ref-filter: fix memory leak in `free_array_item()`\n\nMatheus Tavares (8):\n clone: better handle symlinked files at .git/objects/\n dir-iterator: use warning_errno when possible\n dir-iterator: refactor state machine model\n dir-iterator: add flags parameter to dir_iterator_begin\n clone: copy hidden paths at local clone\n clone: extract function from copy_or_link_directory\n clone: use dir-iterator to avoid explicit dir traversal\n clone: replace strcmp by fspathcmp\n\nMatthew DeVore (5):\n list-objects-filter-options: error is localizeable\n list-objects-filter: correct usage of ALLOC_GROW\n url: do not read past end of buffer\n url: do not allow %00 to represent NUL in URLs\n ref-filter: sort detached HEAD lines firstly\n\nMazo, Andrey (8):\n git-p4: detect/prevent infinite loop in gitCommitByP4Change()\n git-p4: add failing test for \"git-p4: match branches case insensitively if configured\"\n git-p4: match branches case insensitively if configured\n git-p4: don't groom exclude path list on every commit\n git-p4: add failing test for \"don't exclude other files with same prefix\"\n git-p4: don't exclude other files with same prefix\n git-p4: add failing test for \"git-p4: respect excluded paths when detecting branches\"\n git-p4: respect excluded paths when detecting branches\n\nMichael Osipov (1):\n configure: Detect linking style for HP aCC on HP-UX\n\nMichael Platings (2):\n blame: add a fingerprint heuristic to match ignored lines\n t8014: remove unnecessary braces\n\nMiguel Ojeda (1):\n clang-format: use git grep to generate the ForEachMacros list\n\nMike Hommey (2):\n dup() the input fd for fast-import used for remote helpers\n Use xmmap_gently instead of xmmap in use_pack\n\nMike Mueller (1):\n p4 unshelve: fix \"Not a valid object name HEAD0\" on Windows\n\nMorian Sonnet (1):\n submodule foreach: fix recursion of options\n\nNguyễn Thái Ngọc Duy (63):\n git-checkout.txt: spell out --no-option\n git-checkout.txt: fix one syntax line\n doc: document --overwrite-ignore\n git-checkout.txt: fix monospace typeset\n t: rename t2014-switch.sh to t2014-checkout-switch.sh\n checkout: advice how to get out of detached HEAD mode\n checkout: inform the user when removing branch state\n checkout: keep most #include sorted\n checkout: factor out some code in parse_branchname_arg()\n checkout: make \"opts\" in cmd_checkout() a pointer\n checkout: move 'confict_style' and 'dwim_..' to checkout_opts\n checkout: split options[] array in three pieces\n checkout: split part of it to new command 'switch'\n switch: better names for -b and -B\n switch: add --discard-changes\n switch: remove -l\n switch: stop accepting pathspec\n switch: reject \"do nothing\" case\n switch: only allow explicit detached HEAD\n switch: add short option for --detach\n switch: implicit dwim, use --no-guess to disable it\n switch: no worktree status unless real branch switch happens\n switch: reject if some operation is in progress\n switch: make --orphan switch to an empty tree\n t: add tests for switch\n completion: support switch\n doc: promote \"git switch\"\n checkout: split part of it to new command 'restore'\n restore: take tree-ish from --source option instead\n restore: make pathspec mandatory\n restore: disable overlay mode by default\n checkout: factor out worktree checkout code\n restore: add --worktree and --staged\n restore: reject invalid combinations with --staged\n restore: default to --source=HEAD when only --staged is specified\n restore: replace --force with --ignore-unmerged\n restore: support --patch\n t: add tests for restore\n completion: support restore\n user-manual.txt: prefer 'merge --abort' over 'reset --hard'\n doc: promote \"git restore\"\n help: move git-diff and git-reset to different groups\n Declare both git-switch and git-restore experimental\n merge: remove drop_save() in favor of remove_merge_branch_state()\n init: make --template path relative to $CWD\n worktree add: sanitize worktree names\n worktree add: be tolerant of corrupt worktrees\n merge: add --quit\n completion: do not cache if --git-completion-helper fails\n fetch: only run 'gc' once when fetching multiple remotes\n t2027: use test_must_be_empty\n switch: allow to switch in the middle of bisect\n completion: disable dwim on \"git switch -d\"\n fetch-pack: move capability names out of i18n strings\n fetch-pack: print all relevant supported capabilities with -v -v\n fetch-pack: print server version at the top in -v -v\n sha1-file.c: remove the_repo from read_object_with_reference()\n tree-walk.c: remove the_repo from fill_tree_descriptor()\n tree-walk.c: remove the_repo from get_tree_entry()\n tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()\n match-trees.c: remove the_repo from shift_tree*()\n Use the right 'struct repository' instead of the_repository\n t7814: do not generate same commits in different repos\n\nNickolai Belakovski (3):\n ref-filter: add worktreepath atom\n branch: update output to include worktree info\n branch: add worktree info on verbose output\n\nPaolo Bonzini (2):\n request-pull: quote regex metacharacters in local ref\n request-pull: warn if the remote object is not the same as the local one\n\nPhilip Oakley (6):\n git.c: show usage for accessing the git(1) help page\n Doc: git.txt: remove backticks from link and add git-scm.com/docs\n doc branch: provide examples for listing remote tracking branches\n msvc: include sigset_t definition\n msvc: define O_ACCMODE\n msvc: add pragmas for common warnings\n\nPhillip Wood (12):\n rebase: fix a memory leak\n rebase: warn if state directory cannot be removed\n sequencer: return errors from sequencer_remove_state()\n rebase --abort/--quit: cleanup refs/rewritten\n rebase -r: always reword merge -c\n add -p: fix checkout -p with pathological context\n show --continue/skip etc. consistently in synopsis\n sequencer: always allow tab after command name\n sequencer: factor out todo command name parsing\n status: do not report errors in sequencer/todo\n git-prompt: improve cherry-pick/revert detection\n t3420: remove progress lines before comparing output\n\nQuentin Nerden (2):\n docs: git-clone: refer to long form of options\n docs: git-clone: list short form of options first\n\nRamsay Jones (1):\n env--helper: mark a file-local symbol as static\n\nRené Scharfe (6):\n cleanup: fix possible overflow errors in binary search, part 2\n coccinelle: use COPY_ARRAY for copying arrays\n use COPY_ARRAY for copying arrays\n config: use unsigned_mult_overflows to check for overflows\n config: don't multiply in parse_unit_factor()\n config: simplify parsing of unit factors\n\nRobert Morgan (1):\n gpg(docs): use correct --verify syntax\n\nRohit Ashiwal (5):\n sequencer: add advice for revert\n sequencer: rename reset_for_rollback to reset_merge\n sequencer: use argv_array in reset_merge\n cherry-pick/revert: add --skip option\n cherry-pick/revert: advise using --skip\n\nSZEDER Gábor (11):\n t3404: modernize here doc style\n t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused\n pager: add a helper function to clear the last line in the terminal\n t5551: use 'test_i18ngrep' to check translated output\n rebase: fix garbled progress display with '-x'\n progress: use term_clear_line()\n Document that 'git -C \"\"' works and doesn't change directory\n ci: don't update Homebrew\n ci: disable Homebrew's auto cleanup\n ci/lib.sh: update a comment about installed P4 and Git-LFS versions\n travis-ci: build with GCC 4.8 as well\n\nSimon Williams (1):\n git-p4: allow unshelving of branched files\n\nStephen Boyd (2):\n format-patch: inform user that patch-id generation is unstable\n format-patch: make --base patch-id output stable\n\nSteven Roberts (1):\n gpg-interface: do not scan past the end of buffer\n\nTaylor Blau (1):\n ref-filter.c: find disjoint pattern prefixes\n\nThomas Gummerer (16):\n stash: fix show referencing stash index\n apply: replace marc.info link with public-inbox\n apply: only pass required data to skip_tree_prefix\n apply: only pass required data to git_header_name\n apply: only pass required data to check_header_line\n apply: only pass required data to find_name_*\n apply: only pass required data to gitdiff_* functions\n apply: make parse_git_diff_header public\n range-diff: fix function parameter indentation\n range-diff: split lines manually\n range-diff: don't remove funcname from inner diff\n range-diff: suppress line count in outer diff\n range-diff: add section header instead of diff header\n range-diff: add filename to inner diff\n range-diff: add headers to the outer hunk header\n stash: fix handling removed files with --keep-index\n\nTigran Mkrtchyan (1):\n tag: add tag.gpgSign config option to force all tags be GPG-signed\n\nVarun Naik (1):\n read-cache.c: do not die if mmap fails\n\nVishal Verma (1):\n merge: refuse --commit with --squash\n\nXin Li (1):\n clone: respect user supplied origin name when setting up partial clone\n\nÆvar Arnfjörð Bjarmason (21):\n send-email: move the read_config() function above getopts\n send-email: rename the @bcclist variable for consistency\n send-email: do defaults -> config -> getopt in that order\n tests: add a special setup where prerequisites fail\n Makefile: remove the NO_R_TO_GCC_LINKER flag\n send-email: remove cargo-culted multi-patch pattern in tests\n send-email: fix broken transferEncoding tests\n send-email: document --no-[to|cc|bcc]\n hash-object doc: stop mentioning git-cvsimport\n send-email: fix regression in sendemail.identity parsing\n Revert \"test-lib: whitelist GIT_TR2_* in the environment\"\n config tests: simplify include cycle test\n env--helper: new undocumented builtin wrapping git_env_*()\n config.c: refactor die_bad_number() to not call gettext() early\n t6040 test: stop using global \"script\" variable\n tests: make GIT_TEST_GETTEXT_POISON a boolean\n tests README: re-flow a previously changed paragraph\n tests: replace test_tristate with \"git env--helper\"\n tests: make GIT_TEST_FAIL_PREREQS a boolean\n tests: mark two failing tests under FAIL_PREREQS\n clone: test for our behavior on odd objects/* content\n\n"},{"id":"379662","messageId":"nycvar.QRO.7.76.6.1907311440130.21907@tvgsbejvaqbjf.bet","threadId":"51549","inReplyTo":"xmqqh874tssp.fsf@gitster-ct.c.googlers.com","subject":"Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-07-31T12:43:10Z","receivedAt":"2019-07-31T12:43:18Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Mon, 29 Jul 2019, Junio C Hamano wrote:\n\n> An early preview release Git v2.23.0-rc0 is now available for\n> testing at the usual places. It is comprised of 420 non-merge\n> commits since v2.22.0, contributed by 62 people, 23 of which are\n> new faces.\n>\n> The tarballs are found at:\n>\n> https://www.kernel.org/pub/software/scm/git/testing/\n\nAnd a corresponding Git for Windows v2.23.0-rc0 can be found here:\n\nhttps://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1\n\nPlease test!\n\nOne (slightly annoying) issue I found already is that a `git log` will\nprint out a blurb about `log.mailmap`, but most of the time, you cannot\nsee it because the actual output of `git log` is shown in the pager.\n\nI plan on working around this by setting `log.mailmap = true` in Git for\nWindows' system config.\n\nCiao,\nJohannes\n"},{"id":"379723","messageId":"20190731231848.GC1933@sigill.intra.peff.net","threadId":"51549","inReplyTo":"nycvar.QRO.7.76.6.1907311440130.21907@tvgsbejvaqbjf.bet","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-07-31T23:18:48Z","receivedAt":"2019-07-31T23:18:51Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 31, 2019 at 02:43:10PM +0200, Johannes Schindelin wrote:\n\n> And a corresponding Git for Windows v2.23.0-rc0 can be found here:\n> \n> https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1\n> \n> Please test!\n> \n> One (slightly annoying) issue I found already is that a `git log` will\n> print out a blurb about `log.mailmap`, but most of the time, you cannot\n> see it because the actual output of `git log` is shown in the pager.\n> \n> I plan on working around this by setting `log.mailmap = true` in Git for\n> Windows' system config.\n\nI too was annoyed recently by that warning (I set the config to squelch\nit, but I'm sure it will pop up again for me in some other context where\nI don't have my usual config).\n\nSetting log.mailmap=true in the distributed system seems to defeat the\npurpose, though, doesn't it? The point is for users to see the warning\nand adjust their expectations, but with your plan they would never see\nit.\n\nI think part of what my annoyance is responding to (and your willingness\nto just squelch this for everybody) is that switching this particular\ndefault isn't really that big a deal, that it requires annoying people\non every single \"git log\" invocation. Perhaps we would be better\nsquelching it entirely and just putting a mention in the release notes.\n\nI know that having been burned by the dashed-form deprecation long ago,\nJunio is hesitant to rely on release notes. But it really seems like\nthis is a pretty minor change, and the solution is worse than the\nproblem.\n\n-Peff\n"},{"id":"379724","messageId":"20190801002125.GA176307@google.com","threadId":"51549","inReplyTo":"20190731231848.GC1933@sigill.intra.peff.net","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2019-08-01T00:21:25Z","receivedAt":"2019-08-01T00:21:30Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jeff King wrote:\n\n> I think part of what my annoyance is responding to (and your willingness\n> to just squelch this for everybody) is that switching this particular\n> default isn't really that big a deal, that it requires annoying people\n> on every single \"git log\" invocation. Perhaps we would be better\n> squelching it entirely and just putting a mention in the release notes.\n\nYes.\n\nAlthough as Dscho mentions, it's particularly irritating because it is\nnot part of the paginated output.\n\nI wonder if the ideal might not be to trigger it more selectively, when\nthe output actually changed due to a reflog entry. I mean something\nlike\n\n\tcommit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)\n\tMerge: 18598e40e6 1eba6eb1c2\n\tAuthor: A U Thor (see \"git help mailmap\")\n\tDate: Tue Jul 30 15:05:41 2019 -0700\n\n\t Merge branch 'jt/fetch-cdn-offload' into foo\n\nThe message\n\n\twarning: log.mailmap is not set; its implicit value will change in an\n\tupcoming release. To squelch this message and preserve current\n\tbehaviour, set the log.mailmap configuration value to false.\n\n\tTo squelch this message and adopt the new behaviour now, set the\n\tlog.mailmap configuration value to true.\n\nis *particularly* unactionable in the current state where we're not\nrewriting authors. I think we should bite the bullet and just flip\nthe default to \"true\", with the config as an escape hatch to allow\ngoing back to the old behavior.\n\nIs it too late in the release cycle to do that? If not, we can do\n\n-- >8 --\nSubject: log: use mailmap by default in interactive use\n\nIn f0596ecc8de9 (log: add warning for unspecified log.mailmap setting,\n2019-07-15), we prepared for a future where \"git log\" uses the mailmap\nby default, using the following conditions:\n\n 1. If log.mailmap or --[no-]use-mailmap is set explicitly explicitly,\n respect that. Otherwise:\n\n 2. If output is not going to a terminal or pager, we might be in a\n script. Match historical behavior by not using the mailmap.\n Otherwise:\n\n 3. If the output format was specified using --pretty, we might be in\n a script that produces output intended for copy/paste. Match\n historical behavior by not using the mailmap. Otherwise:\n\n 4. This is an interactive use, where we will be able to change the\n default behavior. Print a warning about the upcoming change\n but don't use the mailmap yet.\n\nIn practice, the case (4) turns out to be irritating. It prints\nbefore pager setup, so it just flashes on the screen. It appears on\nevery \"git log\" invocation, even when the mailmap would not result in\nthe output changing. The change is not meaningful to most people, and\nthe new default of --use-mailmap is likely to be preferable for all of\nthem.\n\nLet's bite the bullet and jump straight to --use-mailmap in case (4).\n\nWhile at it, add a new log.mailmap setting \"auto\" that can be used to\nexplicitly request the new automatic behavior (so that e.g. if\nlog.mailmap is set to \"true\" system-side, I can set it to \"auto\" in my\nper-user configuration).\n\nReported-by: Johannes Schindelin \nSigned-off-by: Jonathan Nieder \n---\n Documentation/RelNotes/2.23.0.txt | 6 ++----\n Documentation/config/log.txt | 4 +++-\n builtin/log.c | 23 ++++++-----------------\n t/t4203-mailmap.sh | 20 ++++++++++++++++++++\n t/t7006-pager.sh | 2 --\n 5 files changed, 31 insertions(+), 24 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\nindex 9896599b2f..b4765a5472 100644\n--- a/Documentation/RelNotes/2.23.0.txt\n+++ b/Documentation/RelNotes/2.23.0.txt\n@@ -91,10 +91,8 @@ UI, Workflows & Features\n commit-graph files now, which allows the commit-graph files to be\n updated incrementally.\n \n- * The \"git log\" command learns to issue a warning when log.mailmap\n- configuration is not set and --[no-]mailmap option is not used, to\n- prepare users for future versions of Git that uses the mailmap by\n- default.\n+ * The \"git log\" command learned to use --mailmap by default when\n+ used interactively without a --pretty format option.\n \n * \"git range-diff\" output has been tweaked for easier identification\n of which part of what file the patch shown is about.\ndiff --git a/Documentation/config/log.txt b/Documentation/config/log.txt\nindex 7798e10cb0..739ea298aa 100644\n--- a/Documentation/config/log.txt\n+++ b/Documentation/config/log.txt\n@@ -41,4 +41,6 @@ log.showSignature::\n log.mailmap::\n \tIf true, makes linkgit:git-log[1], linkgit:git-show[1], and\n \tlinkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise\n-\tassume `--no-use-mailmap`. False by default.\n+\tassume `--no-use-mailmap`. The default is `auto`, which means\n+\tto use mailmap if the output is going to a terminal and no\n+\t`--pretty` format has been specified.\ndiff --git a/builtin/log.c b/builtin/log.c\nindex 1cf9e37736..bafce51d01 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)\n \t\tparse_date_format(default_date_mode, &rev->date_mode);\n }\n \n-static char warn_unspecified_mailmap_msg[] =\n-N_(\"log.mailmap is not set; its implicit value will change in an\\n\"\n- \"upcoming release. To squelch this message and preserve current\\n\"\n- \"behaviour, set the log.mailmap configuration value to false.\\n\"\n- \"\\n\"\n- \"To squelch this message and adopt the new behaviour now, set the\\n\"\n- \"log.mailmap configuration value to true.\\n\"\n- \"\\n\"\n- \"See 'git help config' and search for 'log.mailmap' for further information.\");\n-\n static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \t\t\t struct rev_info *rev, struct setup_revision_opt *opt)\n {\n@@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \tmemset(&w, 0, sizeof(w));\n \tuserformat_find_requirements(NULL, &w);\n \n-\tif (mailmap < 0) {\n-\t\tif (session_is_interactive() && !rev->pretty_given)\n-\t\t\twarning(\"%s\\n\", _(warn_unspecified_mailmap_msg));\n-\n-\t\tmailmap = 0;\n-\t}\n+\tif (mailmap < 0)\n+\t\tmailmap = session_is_interactive() && !rev->pretty_given;\n \n \tif (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n \t\trev->show_notes = 1;\n@@ -477,7 +463,10 @@ static int git_log_config(const char *var, const char *value, void *cb)\n \tif (skip_prefix(var, \"color.decorate.\", &slot_name))\n \t\treturn parse_decorate_color_config(var, slot_name, value);\n \tif (!strcmp(var, \"log.mailmap\")) {\n-\t\tuse_mailmap_config = git_config_bool(var, value);\n+\t\tif (value && !strcasecmp(value, \"auto\"))\n+\t\t\tuse_mailmap_config = -1;\n+\t\telse\n+\t\t\tuse_mailmap_config = git_config_bool(var, value);\n \t\treturn 0;\n \t}\n \tif (!strcmp(var, \"log.showsignature\")) {\ndiff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh\nindex 43b1522ea2..e398bc803a 100755\n--- a/t/t4203-mailmap.sh\n+++ b/t/t4203-mailmap.sh\n@@ -3,6 +3,7 @@\n test_description='.mailmap configurations'\n \n . ./test-lib.sh\n+. \"$TEST_DIRECTORY\"/lib-terminal.sh\n \n fuzz_blame () {\n \tsed \"\n@@ -442,6 +443,25 @@ test_expect_success 'Log output with log.mailmap' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success TTY 'Use mailmap by default when writing to terminal' '\n+\ttest_terminal git log | grep Author >actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success TTY 'Config overrides terminal' '\n+\tcat >expect <<-\\EOF &&\n+\tAuthor: CTO \n+\tAuthor: claus \n+\tAuthor: santa \n+\tAuthor: nick2 \n+\tAuthor: nick2 \n+\tAuthor: nick1 \n+\tAuthor: A U Thor \n+\tEOF\n+\ttest_terminal git -c log.mailmap=False log | grep Author >actual &&\n+\ttest_cmp expect actual\n+'\n+\n cat >expect <<\\EOF\n Author: Santa Claus \n Author: Santa Claus \ndiff --git a/t/t7006-pager.sh b/t/t7006-pager.sh\nindex 7976fa7bcc..00e09a375c 100755\n--- a/t/t7006-pager.sh\n+++ b/t/t7006-pager.sh\n@@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'\n . \"$TEST_DIRECTORY\"/lib-terminal.sh\n \n test_expect_success 'setup' '\n-\t: squelch advice messages during the transition &&\n-\tgit config --global log.mailmap false &&\n \tsane_unset GIT_PAGER GIT_PAGER_IN_USE &&\n \ttest_unconfig core.pager &&\n \n-- \n2.22.0.770.g0f2c4a37fd\n\n"},{"id":"379726","messageId":"CAAOiGNyCrUSPiF9GjXmpPjosV6Ef8B72v54=-5UTqaTBg2hkFA@mail.gmail.com","threadId":"51549","inReplyTo":"20190801002125.GA176307@google.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Ariadne Conill","fromEmail":"ariadne@dereferenced.org","sentAt":"2019-08-01T00:37:55Z","receivedAt":"2019-08-01T00:44:43Z","isPatch":false,"sender":{"key":"ariadne@dereferenced.org","avatar":"https://avatars.githubusercontent.com/u/1522444?v=4"},"body":"Hello,\n\nOn Wed, Jul 31, 2019 at 7:21 PM Jonathan Nieder wrote:\n>\n> Jeff King wrote:\n>\n> > I think part of what my annoyance is responding to (and your willingness\n> > to just squelch this for everybody) is that switching this particular\n> > default isn't really that big a deal, that it requires annoying people\n> > on every single \"git log\" invocation. Perhaps we would be better\n> > squelching it entirely and just putting a mention in the release notes.\n>\n> Yes.\n>\n> Although as Dscho mentions, it's particularly irritating because it is\n> not part of the paginated output.\n>\n> I wonder if the ideal might not be to trigger it more selectively, when\n> the output actually changed due to a reflog entry. I mean something\n> like\n>\n> commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)\n> Merge: 18598e40e6 1eba6eb1c2\n> Author: A U Thor (see \"git help mailmap\")\n> Date: Tue Jul 30 15:05:41 2019 -0700\n>\n> Merge branch 'jt/fetch-cdn-offload' into foo\n>\n> The message\n>\n> warning: log.mailmap is not set; its implicit value will change in an\n> upcoming release. To squelch this message and preserve current\n> behaviour, set the log.mailmap configuration value to false.\n>\n> To squelch this message and adopt the new behaviour now, set the\n> log.mailmap configuration value to true.\n>\n> is *particularly* unactionable in the current state where we're not\n> rewriting authors. I think we should bite the bullet and just flip\n> the default to \"true\", with the config as an escape hatch to allow\n> going back to the old behavior.\n\nThis is what I originally proposed, but it was suggested that we\nshould go through the typical cycle for changing default behaviour in\nGit, e.g. issue a warning and then flip the default in a later release\ncycle (my plan was to do so in the next cycle, in fact).\n\n>\n> Is it too late in the release cycle to do that? If not, we can do\n>\n> -- >8 --\n> Subject: log: use mailmap by default in interactive use\n>\n> In f0596ecc8de9 (log: add warning for unspecified log.mailmap setting,\n> 2019-07-15), we prepared for a future where \"git log\" uses the mailmap\n> by default, using the following conditions:\n>\n> 1. If log.mailmap or --[no-]use-mailmap is set explicitly explicitly,\n> respect that. Otherwise:\n>\n> 2. If output is not going to a terminal or pager, we might be in a\n> script. Match historical behavior by not using the mailmap.\n> Otherwise:\n\nFor what it's worth, personally, I believe that it is best to just\nalways use the mailmap (even in scripts), because most likely if you\ncare about the author line, you're probably caring about the *present*\nidentity of the author who made the commit, because you wish to ask\nthem a question. However, I decided that it would be best to be\nconservative with the behaviour, for now, just in case somebody was\ndependent on the historical author lines.\n\n> 3. If the output format was specified using --pretty, we might be in\n> a script that produces output intended for copy/paste. Match\n> historical behavior by not using the mailmap. Otherwise:\n\nThis one is definitely intentional, as the user specified exactly what\nthey wanted. So, we give them what they want -- if they want the raw\nauthor lines, they get that, if they want the mapped version, then\nthey get that, because they explicitly asked for one or the other.\n\n> 4. This is an interactive use, where we will be able to change the\n> default behavior. Print a warning about the upcoming change\n> but don't use the mailmap yet.\n>\n> In practice, the case (4) turns out to be irritating. It prints\n> before pager setup, so it just flashes on the screen. It appears on\n> every \"git log\" invocation, even when the mailmap would not result in\n> the output changing. The change is not meaningful to most people, and\n> the new default of --use-mailmap is likely to be preferable for all of\n> them.\n>\n> Let's bite the bullet and jump straight to --use-mailmap in case (4).\n\nYes, I agree, the warning is suboptimal when used with a pager, but we\ncan only write to stderr, since writing to stdout may break scripts.\nSo, given the request of having a transitional period, I felt this was\nthe best we could do without breaking anything.\n\n> While at it, add a new log.mailmap setting \"auto\" that can be used to\n> explicitly request the new automatic behavior (so that e.g. if\n> log.mailmap is set to \"true\" system-side, I can set it to \"auto\" in my\n> per-user configuration).\n\nThis sounds like a great compromise, but honestly we should just flip\nthe default. I can't think of any situation where the non-mapped\nauthor lines wouldn't be the more preferable default. If you want the\nraw ones explicitly, you can just ask for them, either with\n`--no-use-mailmap` or with `log.mailmap=false`.\n\n> Reported-by: Johannes Schindelin \n> Signed-off-by: Jonathan Nieder \n\nAt any rate... I don't have any major objections with going this route\nas it solves the problem for the typical use-case, so...\n\nAcked-by: Ariadne Conill \n\nAriadne\n"},{"id":"379728","messageId":"20190801010022.GA6553@sigill.intra.peff.net","threadId":"51549","inReplyTo":"20190801002125.GA176307@google.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-01T01:00:23Z","receivedAt":"2019-08-01T01:00:25Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:\n\n> Although as Dscho mentions, it's particularly irritating because it is\n> not part of the paginated output.\n> \n> I wonder if the ideal might not be to trigger it more selectively, when\n> the output actually changed due to a reflog entry. I mean something\n> like\n> \n> \tcommit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)\n> \tMerge: 18598e40e6 1eba6eb1c2\n> \tAuthor: A U Thor (see \"git help mailmap\")\n> \tDate: Tue Jul 30 15:05:41 2019 -0700\n> \n> \t Merge branch 'jt/fetch-cdn-offload' into foo\n\nI actually kind of like that, because it tells you exactly when it is\nimpacting things (not just that the mailmap was used, but that this\n_particular_ name was mapped, which is going to be the most actionable\nthing). But I do think the syntax above might end up breaking somebody\nwho's trying to parse it (people aren't supposed to be parsing log\noutput, but...).\n\nSomething like:\n\n Author: A U Thor \n Original-Author: I M Mailmapped \n\ngives even more information while leaving the \"Author:\" line untouched.\nBut in introducing a new line, it may also be breaking somebody.\n\nI think all of these are riskier than just quietly engaging the mailmap.\nThat's syntactically identical, so no risk of parsing regressions That's\nalmost always going to be what people _actually_ want if there's a\nmailmap in the repo. The only exception is if they're somehow trying to\ndo analysis on original versus mapped names. At which point they really\nought to be using a parseable format like --pretty=raw, or \"%an <%ae>\".\n\n> is *particularly* unactionable in the current state where we're not\n> rewriting authors. I think we should bite the bullet and just flip\n> the default to \"true\", with the config as an escape hatch to allow\n> going back to the old behavior.\n> \n> Is it too late in the release cycle to do that? If not, we can do\n\nIMHO no, it is not too late. This is a new feature in this release, and\nwe're at -rc0. The point of the rc period is to find problems in the new\ncode. So certainly I think it is not too late to change our minds about\nthis feature. I could see an argument that instead of changing it now,\nwe should revert for v2.23 and work on it with less urgency during the\nnext cycle. But personally I'd see what a day or two of discussion turns\nup; if everybody agrees on the path forward and the implementation isn't\ncomplicated, it may be easiest to just proceed now.\n\n> -- >8 --\n> Subject: log: use mailmap by default in interactive use\n\nThis seems OK to me, though I kind of wonder if anybody really wants\n\"auto\". Unlike log.decorate, which changes the syntax, there is no real\nreason to avoid mailmap when somebody else is parsing the output. And I\ncould imagine it is especially confusing if:\n\n git log --author=whoever\n\nand\n\n git log | grep whoever | wc -l\n\ndo not agree.\n\n-Peff\n"},{"id":"379729","messageId":"CAGyf7-FnqiTDjSRcxhaJZtfws9XqJ4a9-OGwVY+juibVuwBMBQ@mail.gmail.com","threadId":"51549","inReplyTo":"nycvar.QRO.7.76.6.1907311440130.21907@tvgsbejvaqbjf.bet","subject":"Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Bryan Turner","fromEmail":"bturner@atlassian.com","sentAt":"2019-08-01T01:04:52Z","receivedAt":"2019-08-01T01:05:05Z","isPatch":false,"sender":{"key":"bturner@atlassian.com","avatar":"https://gravatar.com/avatar/16bcf3167981c1ef7c804e502642366d888a35b0d0b0a4ca01fdc442aa1acb1e?d=mp&s=160"},"body":"On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin\n wrote:\n>\n> Hi,\n>\n> On Mon, 29 Jul 2019, Junio C Hamano wrote:\n>\n> > An early preview release Git v2.23.0-rc0 is now available for\n> > testing at the usual places. It is comprised of 420 non-merge\n> > commits since v2.22.0, contributed by 62 people, 23 of which are\n> > new faces.\n> >\n> > The tarballs are found at:\n> >\n> > https://www.kernel.org/pub/software/scm/git/testing/\n>\n> And a corresponding Git for Windows v2.23.0-rc0 can be found here:\n>\n> https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1\n>\n> Please test!\n\n\nI've run the full test suite for Bitbucket Server against 2.23.0-rc0\non Linux, macOS and Windows. No test failures to report.\n\nThanks again for these early release candidates! They're a great\nopportunity to test new releases in advance.\n\nBest regards,\nBryan Turner\n"},{"id":"379730","messageId":"20190801011448.GB176307@google.com","threadId":"51549","inReplyTo":"20190801010022.GA6553@sigill.intra.peff.net","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2019-08-01T01:14:48Z","receivedAt":"2019-08-01T01:14:52Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Jeff King wrote:\n\n> This seems OK to me, though I kind of wonder if anybody really wants\n> \"auto\".\n\nSure. It's just the usual way of handling the lack of support for an\n\"unset\" directive in git's config syntax (for example, if a script\nauthor wants to test the default behavior).\n\nThanks,\nJonathan\n"},{"id":"379733","messageId":"CAAOiGNwDV3LNGRVPQN6DgES6raG76u-rW0nBuw=i2oHTibVSPg@mail.gmail.com","threadId":"51549","inReplyTo":"20190801010022.GA6553@sigill.intra.peff.net","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Ariadne Conill","fromEmail":"ariadne@dereferenced.org","sentAt":"2019-08-01T01:38:14Z","receivedAt":"2019-08-01T01:38:27Z","isPatch":false,"sender":{"key":"ariadne@dereferenced.org","avatar":"https://avatars.githubusercontent.com/u/1522444?v=4"},"body":"Hello,\n\nOn Wed, Jul 31, 2019 at 8:00 PM Jeff King wrote:\n>\n> On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:\n>\n> > Although as Dscho mentions, it's particularly irritating because it is\n> > not part of the paginated output.\n> >\n> > I wonder if the ideal might not be to trigger it more selectively, when\n> > the output actually changed due to a reflog entry. I mean something\n> > like\n> >\n> > commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)\n> > Merge: 18598e40e6 1eba6eb1c2\n> > Author: A U Thor (see \"git help mailmap\")\n> > Date: Tue Jul 30 15:05:41 2019 -0700\n> >\n> > Merge branch 'jt/fetch-cdn-offload' into foo\n>\n> I actually kind of like that, because it tells you exactly when it is\n> impacting things (not just that the mailmap was used, but that this\n> _particular_ name was mapped, which is going to be the most actionable\n> thing). But I do think the syntax above might end up breaking somebody\n> who's trying to parse it (people aren't supposed to be parsing log\n> output, but...).\n>\n> Something like:\n>\n> Author: A U Thor \n> Original-Author: I M Mailmapped \n>\n> gives even more information while leaving the \"Author:\" line untouched.\n> But in introducing a new line, it may also be breaking somebody.\n\nIt also makes this entire exercise completely moot because not only\ndoes it deadname the contributor, it discloses that it is deadnaming\nthe contributor while also telling you who they are now, which is even\nworse than the current behaviour. The purpose of this exercise is to\nensure that users have the *current* contact information of the\ncontributor by default, including their current name and e-mail. My\nentire goal behind transitioning this config default is to ensure that\ngit respects *present* identity information by default, while giving\naccess to the raw identity data in cases where it makes sense to do so\n(such as historical research or whatever). I don't really wish for\ngit to remind me of my previous identity while browsing through\nhistorical git logs. I also don't think most people care about the\nprevious identity data of contributors -- in most cases, if you're\nlooking up a commit's author, you're doing so because you intend to\nask them a question about the commit, and so, having the most current\nidentity data available is what actually makes sense.\n\n> I think all of these are riskier than just quietly engaging the mailmap.\n> That's syntactically identical, so no risk of parsing regressions That's\n> almost always going to be what people _actually_ want if there's a\n> mailmap in the repo. The only exception is if they're somehow trying to\n> do analysis on original versus mapped names. At which point they really\n> ought to be using a parseable format like --pretty=raw, or \"%an <%ae>\".\n\nPrecisely, which is why I think we should just flip the default.\nHowever, as previously mentioned, it was requested to do a formal\ntransition for the config setting, just to be absolutely sure that\npeople are aware the default was going to flip.\n\n> > is *particularly* unactionable in the current state where we're not\n> > rewriting authors. I think we should bite the bullet and just flip\n> > the default to \"true\", with the config as an escape hatch to allow\n> > going back to the old behavior.\n> >\n> > Is it too late in the release cycle to do that? If not, we can do\n>\n> IMHO no, it is not too late. This is a new feature in this release, and\n> we're at -rc0. The point of the rc period is to find problems in the new\n> code. So certainly I think it is not too late to change our minds about\n> this feature. I could see an argument that instead of changing it now,\n> we should revert for v2.23 and work on it with less urgency during the\n> next cycle. But personally I'd see what a day or two of discussion turns\n> up; if everybody agrees on the path forward and the implementation isn't\n> complicated, it may be easiest to just proceed now.\n\nHonestly, the current default is arguably an unintentional bug. As\nyou note, it's a default that makes no sense and flipping it will give\npeople what they *actually* want. Accordingly, I have thought, and\nstill think, that we're best off just flipping the default and saying\nwe fixed a bug, because the current behaviour is certainly perceived\nby many people as being a bug -- in fact, when I first looked into\nthis, I thought it *was* a bug, only to find out that the default was\nthe way it was. I'm certainly not alone in perceiving the current\nbehaviour as a bug, especially since `git shortlog` respects mailmap\nby default and `git log` doesn't.\n\n>\n> > -- >8 --\n> > Subject: log: use mailmap by default in interactive use\n>\n> This seems OK to me, though I kind of wonder if anybody really wants\n> \"auto\". Unlike log.decorate, which changes the syntax, there is no real\n> reason to avoid mailmap when somebody else is parsing the output. And I\n> could imagine it is especially confusing if:\n>\n> git log --author=whoever\n>\n> and\n>\n> git log | grep whoever | wc -l\n>\n> do not agree.\n>\n> -Peff\n"},{"id":"379735","messageId":"20190801025342.GA7102@sigill.intra.peff.net","threadId":"51549","inReplyTo":"CAAOiGNwDV3LNGRVPQN6DgES6raG76u-rW0nBuw=i2oHTibVSPg@mail.gmail.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-01T02:53:42Z","receivedAt":"2019-08-01T02:53:45Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Jul 31, 2019 at 08:38:14PM -0500, Ariadne Conill wrote:\n\n> > Something like:\n> >\n> > Author: A U Thor \n> > Original-Author: I M Mailmapped \n> >\n> > gives even more information while leaving the \"Author:\" line untouched.\n> > But in introducing a new line, it may also be breaking somebody.\n> \n> It also makes this entire exercise completely moot because not only\n> does it deadname the contributor, it discloses that it is deadnaming\n> the contributor while also telling you who they are now, which is even\n> worse than the current behaviour. The purpose of this exercise is to\n> ensure that users have the *current* contact information of the\n> contributor by default, including their current name and e-mail. My\n> entire goal behind transitioning this config default is to ensure that\n> git respects *present* identity information by default, while giving\n> access to the raw identity data in cases where it makes sense to do so\n> (such as historical research or whatever). I don't really wish for\n> git to remind me of my previous identity while browsing through\n> historical git logs. I also don't think most people care about the\n> previous identity data of contributors -- in most cases, if you're\n> looking up a commit's author, you're doing so because you intend to\n> ask them a question about the commit, and so, having the most current\n> identity data available is what actually makes sense.\n\nFair enough. My thinking was just that it would make it clear to\nsomebody who wasn't expecting the mailmap to be used what was going on:\nthey would have seen \"orig\" in the old output, but now they are seeing\n\"author\". But I agree that most people wouldn't even _care_, and the\norig name is just garbage in most cases.\n\nI had been thinking it would be a temporary measure during the\ntransition period, but it probably isn't even worth the hassle and\nconfusion it would cause during that period.\n\nBy the way, we've been talking mostly about output in this thread. One\nthing that did catch me a little by surprise is that \"--author\", etc,\nwill now use the mailmap by default, too. Which I think makes perfect\nsense, but when looking for my own mailmapped entries to run some\nexamples on, I was surprised at first that \"git log\n--author=peff@github.com\" didn't find anything.\n\nBut aside from experimenting with this mailmap feature, I cannot think\nof a single time in the last decade I would have cared about that\ndistinction (and in fact, most of the time I would be searching for my\nown commits by my mailmapped address, and would have preferred they be\nfound in that group).\n\n-Peff\n"},{"id":"379738","messageId":"xmqqsgqlo9j6.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190801010022.GA6553@sigill.intra.peff.net","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T03:21:33Z","receivedAt":"2019-08-01T03:21:41Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n> This seems OK to me, though I kind of wonder if anybody really wants\n> \"auto\". Unlike log.decorate, which changes the syntax, there is no real\n> reason to avoid mailmap when somebody else is parsing the output. And I\n> could imagine it is especially confusing if:\n>\n> git log --author=whoever\n>\n> and\n>\n> git log | grep whoever | wc -l\n>\n> do not agree.\n\nI personally do not think it is too late to change for the upcoming\nrelease, either.\n\nBut 'auto' that changes the displayed name depending on the output\nbeing or not being a terminal makes little sense, I would think, for\nthe above reason.\n\n"},{"id":"379739","messageId":"CAAOiGNzzGqSYxhw=KACYRTxArCY+5H8M4UyY5LFdsnO5VehpOA@mail.gmail.com","threadId":"51549","inReplyTo":"xmqqsgqlo9j6.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Ariadne Conill","fromEmail":"ariadne@dereferenced.org","sentAt":"2019-08-01T04:54:07Z","receivedAt":"2019-08-01T04:54:20Z","isPatch":false,"sender":{"key":"ariadne@dereferenced.org","avatar":"https://avatars.githubusercontent.com/u/1522444?v=4"},"body":"Hello,\n\nOn Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano wrote:\n>\n> Jeff King writes:\n>\n> > This seems OK to me, though I kind of wonder if anybody really wants\n> > \"auto\". Unlike log.decorate, which changes the syntax, there is no real\n> > reason to avoid mailmap when somebody else is parsing the output. And I\n> > could imagine it is especially confusing if:\n> >\n> > git log --author=whoever\n> >\n> > and\n> >\n> > git log | grep whoever | wc -l\n> >\n> > do not agree.\n>\n> I personally do not think it is too late to change for the upcoming\n> release, either.\n>\n> But 'auto' that changes the displayed name depending on the output\n> being or not being a terminal makes little sense, I would think, for\n> the above reason.\n>\n\nI think if the warning is annoying people, then we should just change\nthe default and document it in the release notes. Ultimately, I think\nthat this is behaviour that most see as a bug (especially when you\nconsider that `git shortlog` and `git blame` default to using mailmap\nalready), so simply describing it as a bugfix is arguably sufficient.\n\nAriadne\n"},{"id":"379742","messageId":"20190801141221.3626-1-martin.agren@gmail.com","threadId":"51549","inReplyTo":"xmqqh874tssp.fsf@gitster-ct.c.googlers.com","subject":"[PATCH] RelNotes/2.23.0: fix a few typos and other minor issues","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-08-01T14:12:20Z","receivedAt":"2019-08-01T14:12:54Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"Fix the spelling of the new \"--no-show-forced-updates\" option that \"git\nfetch/pull\" learned. Similarly, spell \"--function-context\" correctly and\nfix a few typos, grammos and minor mistakes.\n\nOne of these is also in 2.22.1.txt, so fix it there too.\n\nSigned-off-by: Martin Ågren \n---\n Documentation/RelNotes/2.22.1.txt | 2 +-\n Documentation/RelNotes/2.23.0.txt | 14 +++++++-------\n 2 files changed, 8 insertions(+), 8 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt\nindex 78b2c5ea8a..76dd8fb578 100644\n--- a/Documentation/RelNotes/2.22.1.txt\n+++ b/Documentation/RelNotes/2.22.1.txt\n@@ -94,7 +94,7 @@ Fixes since v2.22\n \n * The configuration variable rebase.rescheduleFailedExec should be\n effective only while running an interactive rebase and should not\n- affect anything when running an non-interactive one, which was not\n+ affect anything when running a non-interactive one, which was not\n the case. This has been corrected.\n \n * \"git submodule foreach\" did not protect command line options passed\ndiff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\nindex 19e894a44e..e1b1ce5680 100644\n--- a/Documentation/RelNotes/2.23.0.txt\n+++ b/Documentation/RelNotes/2.23.0.txt\n@@ -52,7 +52,7 @@ UI, Workflows & Features\n \n * \"git fetch\" and \"git pull\" reports when a fetch results in\n non-fast-forward updates to let the user notice unusual situation.\n- The commands learned \"--no-shown-forced-updates\" option to disable\n+ The commands learned \"--no-show-forced-updates\" option to disable\n this safety feature.\n \n * Two new commands \"git switch\" and \"git restore\" are introduced to\n@@ -68,7 +68,7 @@ UI, Workflows & Features\n * The conditional inclusion mechanism learned to base the choice on\n the branch the HEAD currently is on.\n \n- * \"git rev-list --objects\" learned with \"--no-object-names\" option to\n+ * \"git rev-list --objects\" learned the \"--no-object-names\" option to\n squelch the path to the object that is used as a grouping hint for\n pack-objects.\n \n@@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.\n no longer be used.\n \n * Developer support to emulate unsatisfied prerequisites in tests to\n- ensure that the remainer of the tests still succeeds when tests\n+ ensure that the remainder of the tests still succeeds when tests\n with prerequisites are skipped.\n \n * \"git update-server-info\" learned not to rewrite the file with the\n@@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.\n * Prepare use of reachability index in topological walker that works\n on a range (A..B).\n \n- * A new tutorial targetting specifically aspiring git-core\n+ * A new tutorial targeting specifically aspiring git-core\n developers has been added.\n \n * Auto-detect how to tell HP-UX aCC where to use dynamically linked\n@@ -181,7 +181,7 @@ Fixes since v2.22\n the same repository was corrupt, which has been corrected.\n \n * The ownership rule for the file descriptor to fast-import remote\n- backend was mixed up, leading to unrelated file descriptor getting\n+ backend was mixed up, leading to an unrelated file descriptor getting\n closed, which has been fixed.\n \n * A \"merge -c\" instruction during \"git rebase --rebase-merges\" should\n@@ -306,7 +306,7 @@ Fixes since v2.22\n \n * The configuration variable rebase.rescheduleFailedExec should be\n effective only while running an interactive rebase and should not\n- affect anything when running an non-interactive one, which was not\n+ affect anything when running a non-interactive one, which was not\n the case. This has been corrected.\n \n * The \"git clone\" documentation refers to command line options in its\n@@ -339,7 +339,7 @@ Fixes since v2.22\n having to consult the other end, which has been corrected.\n \n * The internal diff machinery can be made to read out of bounds while\n- looking for --funcion-context line in a corner case, which has been\n+ looking for --function-context line in a corner case, which has been\n corrected.\n (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).\n \n-- \n2.23.0.rc0\n\n"},{"id":"379746","messageId":"xmqqlfwcopn1.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190801002125.GA176307@google.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T15:45:54Z","receivedAt":"2019-08-01T15:46:03Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> Although as Dscho mentions, it's particularly irritating because it is\n> not part of the paginated output.\n> ...\n> Let's bite the bullet and jump straight to --use-mailmap in case (4).\n>\n> While at it, add a new log.mailmap setting \"auto\" that can be used to\n> explicitly request the new automatic behavior (so that e.g. if\n> log.mailmap is set to \"true\" system-side, I can set it to \"auto\" in my\n> per-user configuration).\n\nWhile I think \"revert to hardcoded default\" may be a good idea, I do\nnot think the hardcoded default you implemented that changes the\nbehaviour based on the output destination makes much sense. If I\nwant to eradicate junkio@cox.net from my paged/interactive output, I\nwant to eradicate it also in the output piped to the script I use\nfor authorship stats. \n\nI suspect that you may have misread the \"is interactive\" bit in the\noriginal; that was used only to decide if we are going to warn.\n\nAnyway, how about this much simplified version?\n\n-- >8 --\nFrom: Junio C Hamano \nDate: Thu, 1 Aug 2019 08:32:44 -0700\nSubject: [PATCH] log: flip the --mailmap default unconditionally\n\nIt turns out that being cautious to warn against upcoming default\nchange was an unpopular behaviour, and such a care can easily be\ndefeated by distro packagers to render it ineffective anyway.\n\nJust flip the default, with only a mention in the release notes.\n\nSigned-off-by: Junio C Hamano \n---\n Documentation/RelNotes/2.23.0.txt | 8 +++-----\n builtin/log.c | 16 +---------------\n t/t7006-pager.sh | 2 --\n 3 files changed, 4 insertions(+), 22 deletions(-)\n\ndiff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\nindex 19e894a44e..6ef8f21b56 100644\n--- a/Documentation/RelNotes/2.23.0.txt\n+++ b/Documentation/RelNotes/2.23.0.txt\n@@ -10,6 +10,9 @@ Backward compatibility note\n prerequisite patches in an unstable way, which has been updated to\n compute in a way that is compatible with \"git patch-id --stable\".\n \n+ * The \"git log\" command by default behaves as if the --mailmap option\n+ was given.\n+\n \n UI, Workflows & Features\n \n@@ -91,11 +94,6 @@ UI, Workflows & Features\n commit-graph files now, which allows the commit-graph files to be\n updated incrementally.\n \n- * The \"git log\" command learns to issue a warning when log.mailmap\n- configuration is not set and --[no-]mailmap option is not used, to\n- prepare users for future versions of Git that uses the mailmap by\n- default.\n-\n * \"git range-diff\" output has been tweaked for easier identification\n of which part of what file the patch shown is about.\n \ndiff --git a/builtin/log.c b/builtin/log.c\nindex 1cf9e37736..40b4cbf57d 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)\n \t\tparse_date_format(default_date_mode, &rev->date_mode);\n }\n \n-static char warn_unspecified_mailmap_msg[] =\n-N_(\"log.mailmap is not set; its implicit value will change in an\\n\"\n- \"upcoming release. To squelch this message and preserve current\\n\"\n- \"behaviour, set the log.mailmap configuration value to false.\\n\"\n- \"\\n\"\n- \"To squelch this message and adopt the new behaviour now, set the\\n\"\n- \"log.mailmap configuration value to true.\\n\"\n- \"\\n\"\n- \"See 'git help config' and search for 'log.mailmap' for further information.\");\n-\n static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \t\t\t struct rev_info *rev, struct setup_revision_opt *opt)\n {\n@@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \tmemset(&w, 0, sizeof(w));\n \tuserformat_find_requirements(NULL, &w);\n \n-\tif (mailmap < 0) {\n-\t\tif (session_is_interactive() && !rev->pretty_given)\n-\t\t\twarning(\"%s\\n\", _(warn_unspecified_mailmap_msg));\n-\n+\tif (mailmap < 0)\n \t\tmailmap = 0;\n-\t}\n \n \tif (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n \t\trev->show_notes = 1;\ndiff --git a/t/t7006-pager.sh b/t/t7006-pager.sh\nindex 7976fa7bcc..00e09a375c 100755\n--- a/t/t7006-pager.sh\n+++ b/t/t7006-pager.sh\n@@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'\n . \"$TEST_DIRECTORY\"/lib-terminal.sh\n \n test_expect_success 'setup' '\n-\t: squelch advice messages during the transition &&\n-\tgit config --global log.mailmap false &&\n \tsane_unset GIT_PAGER GIT_PAGER_IN_USE &&\n \ttest_unconfig core.pager &&\n \n-- \n2.23.0-rc0-144-gce799e40b3\n\n\n\n"},{"id":"379752","messageId":"xmqqa7csop5d.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190801141221.3626-1-martin.agren@gmail.com","subject":"Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T15:56:30Z","receivedAt":"2019-08-01T15:58:43Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> Fix the spelling of the new \"--no-show-forced-updates\" option that \"git\n> fetch/pull\" learned. Similarly, spell \"--function-context\" correctly and\n> fix a few typos, grammos and minor mistakes.\n>\n> One of these is also in 2.22.1.txt, so fix it there too.\n>\n> Signed-off-by: Martin Ågren \n\nThanks.\n\n> ---\n> Documentation/RelNotes/2.22.1.txt | 2 +-\n> Documentation/RelNotes/2.23.0.txt | 14 +++++++-------\n> 2 files changed, 8 insertions(+), 8 deletions(-)\n>\n> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt\n> index 78b2c5ea8a..76dd8fb578 100644\n> --- a/Documentation/RelNotes/2.22.1.txt\n> +++ b/Documentation/RelNotes/2.22.1.txt\n> @@ -94,7 +94,7 @@ Fixes since v2.22\n> \n> * The configuration variable rebase.rescheduleFailedExec should be\n> effective only while running an interactive rebase and should not\n> - affect anything when running an non-interactive one, which was not\n> + affect anything when running a non-interactive one, which was not\n> the case. This has been corrected.\n> \n> * \"git submodule foreach\" did not protect command line options passed\n> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\n> index 19e894a44e..e1b1ce5680 100644\n> --- a/Documentation/RelNotes/2.23.0.txt\n> +++ b/Documentation/RelNotes/2.23.0.txt\n> @@ -52,7 +52,7 @@ UI, Workflows & Features\n> \n> * \"git fetch\" and \"git pull\" reports when a fetch results in\n> non-fast-forward updates to let the user notice unusual situation.\n> - The commands learned \"--no-shown-forced-updates\" option to disable\n> + The commands learned \"--no-show-forced-updates\" option to disable\n> this safety feature.\n> \n> * Two new commands \"git switch\" and \"git restore\" are introduced to\n> @@ -68,7 +68,7 @@ UI, Workflows & Features\n> * The conditional inclusion mechanism learned to base the choice on\n> the branch the HEAD currently is on.\n> \n> - * \"git rev-list --objects\" learned with \"--no-object-names\" option to\n> + * \"git rev-list --objects\" learned the \"--no-object-names\" option to\n> squelch the path to the object that is used as a grouping hint for\n> pack-objects.\n> \n> @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.\n> no longer be used.\n> \n> * Developer support to emulate unsatisfied prerequisites in tests to\n> - ensure that the remainer of the tests still succeeds when tests\n> + ensure that the remainder of the tests still succeeds when tests\n> with prerequisites are skipped.\n> \n> * \"git update-server-info\" learned not to rewrite the file with the\n> @@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.\n> * Prepare use of reachability index in topological walker that works\n> on a range (A..B).\n> \n> - * A new tutorial targetting specifically aspiring git-core\n> + * A new tutorial targeting specifically aspiring git-core\n> developers has been added.\n> \n> * Auto-detect how to tell HP-UX aCC where to use dynamically linked\n> @@ -181,7 +181,7 @@ Fixes since v2.22\n> the same repository was corrupt, which has been corrected.\n> \n> * The ownership rule for the file descriptor to fast-import remote\n> - backend was mixed up, leading to unrelated file descriptor getting\n> + backend was mixed up, leading to an unrelated file descriptor getting\n> closed, which has been fixed.\n> \n> * A \"merge -c\" instruction during \"git rebase --rebase-merges\" should\n> @@ -306,7 +306,7 @@ Fixes since v2.22\n> \n> * The configuration variable rebase.rescheduleFailedExec should be\n> effective only while running an interactive rebase and should not\n> - affect anything when running an non-interactive one, which was not\n> + affect anything when running a non-interactive one, which was not\n> the case. This has been corrected.\n> \n> * The \"git clone\" documentation refers to command line options in its\n> @@ -339,7 +339,7 @@ Fixes since v2.22\n> having to consult the other end, which has been corrected.\n> \n> * The internal diff machinery can be made to read out of bounds while\n> - looking for --funcion-context line in a corner case, which has been\n> + looking for --function-context line in a corner case, which has been\n> corrected.\n> (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).\n"},{"id":"379753","messageId":"xmqq8sscop4f.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190801141221.3626-1-martin.agren@gmail.com","subject":"Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T15:57:04Z","receivedAt":"2019-08-01T16:00:30Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Martin Ågren writes:\n\n> Fix the spelling of the new \"--no-show-forced-updates\" option that \"git\n> fetch/pull\" learned. Similarly, spell \"--function-context\" correctly and\n> fix a few typos, grammos and minor mistakes.\n>\n> One of these is also in 2.22.1.txt, so fix it there too.\n>\n> Signed-off-by: Martin Ågren \n\nThanks, but it would have been better for this to be in two\npatches. I'll split them up.\n\n\n> ---\n> Documentation/RelNotes/2.22.1.txt | 2 +-\n> Documentation/RelNotes/2.23.0.txt | 14 +++++++-------\n> 2 files changed, 8 insertions(+), 8 deletions(-)\n>\n> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt\n> index 78b2c5ea8a..76dd8fb578 100644\n> --- a/Documentation/RelNotes/2.22.1.txt\n> +++ b/Documentation/RelNotes/2.22.1.txt\n> @@ -94,7 +94,7 @@ Fixes since v2.22\n> \n> * The configuration variable rebase.rescheduleFailedExec should be\n> effective only while running an interactive rebase and should not\n> - affect anything when running an non-interactive one, which was not\n> + affect anything when running a non-interactive one, which was not\n> the case. This has been corrected.\n> \n> * \"git submodule foreach\" did not protect command line options passed\n> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\n> index 19e894a44e..e1b1ce5680 100644\n> --- a/Documentation/RelNotes/2.23.0.txt\n> +++ b/Documentation/RelNotes/2.23.0.txt\n> @@ -52,7 +52,7 @@ UI, Workflows & Features\n> \n> * \"git fetch\" and \"git pull\" reports when a fetch results in\n> non-fast-forward updates to let the user notice unusual situation.\n> - The commands learned \"--no-shown-forced-updates\" option to disable\n> + The commands learned \"--no-show-forced-updates\" option to disable\n> this safety feature.\n> \n> * Two new commands \"git switch\" and \"git restore\" are introduced to\n> @@ -68,7 +68,7 @@ UI, Workflows & Features\n> * The conditional inclusion mechanism learned to base the choice on\n> the branch the HEAD currently is on.\n> \n> - * \"git rev-list --objects\" learned with \"--no-object-names\" option to\n> + * \"git rev-list --objects\" learned the \"--no-object-names\" option to\n> squelch the path to the object that is used as a grouping hint for\n> pack-objects.\n> \n> @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.\n> no longer be used.\n> \n> * Developer support to emulate unsatisfied prerequisites in tests to\n> - ensure that the remainer of the tests still succeeds when tests\n> + ensure that the remainder of the tests still succeeds when tests\n> with prerequisites are skipped.\n> \n> * \"git update-server-info\" learned not to rewrite the file with the\n> @@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.\n> * Prepare use of reachability index in topological walker that works\n> on a range (A..B).\n> \n> - * A new tutorial targetting specifically aspiring git-core\n> + * A new tutorial targeting specifically aspiring git-core\n> developers has been added.\n> \n> * Auto-detect how to tell HP-UX aCC where to use dynamically linked\n> @@ -181,7 +181,7 @@ Fixes since v2.22\n> the same repository was corrupt, which has been corrected.\n> \n> * The ownership rule for the file descriptor to fast-import remote\n> - backend was mixed up, leading to unrelated file descriptor getting\n> + backend was mixed up, leading to an unrelated file descriptor getting\n> closed, which has been fixed.\n> \n> * A \"merge -c\" instruction during \"git rebase --rebase-merges\" should\n> @@ -306,7 +306,7 @@ Fixes since v2.22\n> \n> * The configuration variable rebase.rescheduleFailedExec should be\n> effective only while running an interactive rebase and should not\n> - affect anything when running an non-interactive one, which was not\n> + affect anything when running a non-interactive one, which was not\n> the case. This has been corrected.\n> \n> * The \"git clone\" documentation refers to command line options in its\n> @@ -339,7 +339,7 @@ Fixes since v2.22\n> having to consult the other end, which has been corrected.\n> \n> * The internal diff machinery can be made to read out of bounds while\n> - looking for --funcion-context line in a corner case, which has been\n> + looking for --function-context line in a corner case, which has been\n> corrected.\n> (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).\n"},{"id":"379757","messageId":"CAAOiGNzYUmC+Ns_CiVm-BL06=Sd5ZYuxEgnQK-04BUAwJAqWCQ@mail.gmail.com","threadId":"51549","inReplyTo":"xmqqlfwcopn1.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Ariadne Conill","fromEmail":"ariadne@dereferenced.org","sentAt":"2019-08-01T16:12:02Z","receivedAt":"2019-08-01T16:12:16Z","isPatch":false,"sender":{"key":"ariadne@dereferenced.org","avatar":"https://avatars.githubusercontent.com/u/1522444?v=4"},"body":"Hello,\n\nOn Thu, Aug 1, 2019 at 10:46 AM Junio C Hamano wrote:\n>\n> Jonathan Nieder writes:\n>\n> > Although as Dscho mentions, it's particularly irritating because it is\n> > not part of the paginated output.\n> > ...\n> > Let's bite the bullet and jump straight to --use-mailmap in case (4).\n> >\n> > While at it, add a new log.mailmap setting \"auto\" that can be used to\n> > explicitly request the new automatic behavior (so that e.g. if\n> > log.mailmap is set to \"true\" system-side, I can set it to \"auto\" in my\n> > per-user configuration).\n>\n> While I think \"revert to hardcoded default\" may be a good idea, I do\n> not think the hardcoded default you implemented that changes the\n> behaviour based on the output destination makes much sense. If I\n> want to eradicate junkio@cox.net from my paged/interactive output, I\n> want to eradicate it also in the output piped to the script I use\n> for authorship stats.\n>\n> I suspect that you may have misread the \"is interactive\" bit in the\n> original; that was used only to decide if we are going to warn.\n>\n> Anyway, how about this much simplified version?\n\nIt looks good to me.\n\nAcked-by: Ariadne Conill \n\n>\n> -- >8 --\n> From: Junio C Hamano \n> Date: Thu, 1 Aug 2019 08:32:44 -0700\n> Subject: [PATCH] log: flip the --mailmap default unconditionally\n>\n> It turns out that being cautious to warn against upcoming default\n> change was an unpopular behaviour, and such a care can easily be\n> defeated by distro packagers to render it ineffective anyway.\n>\n> Just flip the default, with only a mention in the release notes.\n>\n> Signed-off-by: Junio C Hamano \n> ---\n> Documentation/RelNotes/2.23.0.txt | 8 +++-----\n> builtin/log.c | 16 +---------------\n> t/t7006-pager.sh | 2 --\n> 3 files changed, 4 insertions(+), 22 deletions(-)\n>\n> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt\n> index 19e894a44e..6ef8f21b56 100644\n> --- a/Documentation/RelNotes/2.23.0.txt\n> +++ b/Documentation/RelNotes/2.23.0.txt\n> @@ -10,6 +10,9 @@ Backward compatibility note\n> prerequisite patches in an unstable way, which has been updated to\n> compute in a way that is compatible with \"git patch-id --stable\".\n>\n> + * The \"git log\" command by default behaves as if the --mailmap option\n> + was given.\n> +\n>\n> UI, Workflows & Features\n>\n> @@ -91,11 +94,6 @@ UI, Workflows & Features\n> commit-graph files now, which allows the commit-graph files to be\n> updated incrementally.\n>\n> - * The \"git log\" command learns to issue a warning when log.mailmap\n> - configuration is not set and --[no-]mailmap option is not used, to\n> - prepare users for future versions of Git that uses the mailmap by\n> - default.\n> -\n> * \"git range-diff\" output has been tweaked for easier identification\n> of which part of what file the patch shown is about.\n>\n> diff --git a/builtin/log.c b/builtin/log.c\n> index 1cf9e37736..40b4cbf57d 100644\n> --- a/builtin/log.c\n> +++ b/builtin/log.c\n> @@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)\n> parse_date_format(default_date_mode, &rev->date_mode);\n> }\n>\n> -static char warn_unspecified_mailmap_msg[] =\n> -N_(\"log.mailmap is not set; its implicit value will change in an\\n\"\n> - \"upcoming release. To squelch this message and preserve current\\n\"\n> - \"behaviour, set the log.mailmap configuration value to false.\\n\"\n> - \"\\n\"\n> - \"To squelch this message and adopt the new behaviour now, set the\\n\"\n> - \"log.mailmap configuration value to true.\\n\"\n> - \"\\n\"\n> - \"See 'git help config' and search for 'log.mailmap' for further information.\");\n> -\n> static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> struct rev_info *rev, struct setup_revision_opt *opt)\n> {\n> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> memset(&w, 0, sizeof(w));\n> userformat_find_requirements(NULL, &w);\n>\n> - if (mailmap < 0) {\n> - if (session_is_interactive() && !rev->pretty_given)\n> - warning(\"%s\\n\", _(warn_unspecified_mailmap_msg));\n> -\n> + if (mailmap < 0)\n> mailmap = 0;\n> - }\n>\n> if (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n> rev->show_notes = 1;\n> diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh\n> index 7976fa7bcc..00e09a375c 100755\n> --- a/t/t7006-pager.sh\n> +++ b/t/t7006-pager.sh\n> @@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'\n> . \"$TEST_DIRECTORY\"/lib-terminal.sh\n>\n> test_expect_success 'setup' '\n> - : squelch advice messages during the transition &&\n> - git config --global log.mailmap false &&\n> sane_unset GIT_PAGER GIT_PAGER_IN_USE &&\n> test_unconfig core.pager &&\n>\n> --\n> 2.23.0-rc0-144-gce799e40b3\n>\n>\n>\n"},{"id":"379769","messageId":"CAN0heSrrrefqh29PQAE0P88YkgbujnY0jPBiHfDJF4uFGVKtGQ@mail.gmail.com","threadId":"51549","inReplyTo":"xmqq8sscop4f.fsf@gitster-ct.c.googlers.com","subject":"Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues","fromName":"Martin Ågren","fromEmail":"martin.agren@gmail.com","sentAt":"2019-08-01T19:28:59Z","receivedAt":"2019-08-01T19:29:13Z","isPatch":true,"sender":{"key":"martin.agren@gmail.com","avatar":null},"body":"On Thu, 1 Aug 2019 at 17:57, Junio C Hamano wrote:\n>\n> Martin Ågren writes:\n>\n> > Fix the spelling of the new \"--no-show-forced-updates\" option that \"git\n> > fetch/pull\" learned. Similarly, spell \"--function-context\" correctly and\n> > fix a few typos, grammos and minor mistakes.\n> >\n> > One of these is also in 2.22.1.txt, so fix it there too.\n>\n> Thanks, but it would have been better for this to be in two\n> patches. I'll split them up.\n\nOh, right, I suppose you'd *much* prefer a patch that applies on maint\nfor the 2.22.1-fix. It didn't occur to me. Sorry about that. Thanks for\nadjusting on your end.\n\nMartin\n"},{"id":"379779","messageId":"20190801213638.GA30522@sigill.intra.peff.net","threadId":"51549","inReplyTo":"xmqqlfwcopn1.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-01T21:36:39Z","receivedAt":"2019-08-01T21:36:41Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Thu, Aug 01, 2019 at 08:45:54AM -0700, Junio C Hamano wrote:\n\n> While I think \"revert to hardcoded default\" may be a good idea, I do\n> not think the hardcoded default you implemented that changes the\n> behaviour based on the output destination makes much sense. If I\n> want to eradicate junkio@cox.net from my paged/interactive output, I\n> want to eradicate it also in the output piped to the script I use\n> for authorship stats. \n> \n> I suspect that you may have misread the \"is interactive\" bit in the\n> original; that was used only to decide if we are going to warn.\n\nYeah, I wondered about the same misreading when I read the response in:\n\n https://public-inbox.org/git/20190801011448.GB176307@google.com/\n\n> Anyway, how about this much simplified version?\n\nYes, this is what I was thinking of in my earlier responses, but...\n\n> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> \tmemset(&w, 0, sizeof(w));\n> \tuserformat_find_requirements(NULL, &w);\n> \n> -\tif (mailmap < 0) {\n> -\t\tif (session_is_interactive() && !rev->pretty_given)\n> -\t\t\twarning(\"%s\\n\", _(warn_unspecified_mailmap_msg));\n> -\n> +\tif (mailmap < 0)\n> \t\tmailmap = 0;\n> -\t}\n\nThis should be \"mailmap = 1\" to match the commit message, no? (Which\nalso implies we may want a new test).\n\nI'd also be OK with leaving it at \"0\" for now, making a note of the\nupcoming change in the release notes, and flipping it _next_ time. But\nIMHO we don't need to be that conservative (and I share your pessimism\nthat enough people actually read the release notes to merit that kind of\nadvance notice).\n\n-Peff\n"},{"id":"379781","messageId":"nycvar.QRO.7.76.6.1908012338070.21907@tvgsbejvaqbjf.bet","threadId":"51549","inReplyTo":"CAAOiGNzzGqSYxhw=KACYRTxArCY+5H8M4UyY5LFdsnO5VehpOA@mail.gmail.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-08-01T21:39:56Z","receivedAt":"2019-08-01T21:40:39Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi,\n\nOn Wed, 31 Jul 2019, Ariadne Conill wrote:\n\n> Hello,\n>\n> On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano wrote:\n> >\n> > Jeff King writes:\n> >\n> > > This seems OK to me, though I kind of wonder if anybody really wants\n> > > \"auto\". Unlike log.decorate, which changes the syntax, there is no real\n> > > reason to avoid mailmap when somebody else is parsing the output. And I\n> > > could imagine it is especially confusing if:\n> > >\n> > > git log --author=whoever\n> > >\n> > > and\n> > >\n> > > git log | grep whoever | wc -l\n> > >\n> > > do not agree.\n> >\n> > I personally do not think it is too late to change for the upcoming\n> > release, either.\n> >\n> > But 'auto' that changes the displayed name depending on the output\n> > being or not being a terminal makes little sense, I would think, for\n> > the above reason.\n> >\n>\n> I think if the warning is annoying people, then we should just change\n> the default and document it in the release notes. Ultimately, I think\n> that this is behaviour that most see as a bug (especially when you\n> consider that `git shortlog` and `git blame` default to using mailmap\n> already), so simply describing it as a bugfix is arguably sufficient.\n\nI also agree!\n\nAnd it makes me happy not only because I am no longer annoyed by that\nwarning that flickers before the pager kicks in, but even happier\nbecause I know people who used to be known by another name that they\nreally do not care about anymore.\n\nThanks,\nDscho\n"},{"id":"379782","messageId":"nycvar.QRO.7.76.6.1908012340300.21907@tvgsbejvaqbjf.bet","threadId":"51549","inReplyTo":"CAGyf7-FnqiTDjSRcxhaJZtfws9XqJ4a9-OGwVY+juibVuwBMBQ@mail.gmail.com","subject":"Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Johannes Schindelin","fromEmail":"johannes.schindelin@gmx.de","sentAt":"2019-08-01T21:40:57Z","receivedAt":"2019-08-01T21:41:07Z","isPatch":false,"sender":{"key":"johannes.schindelin@gmx.de","avatar":"https://avatars.githubusercontent.com/u/127790?v=4"},"body":"Hi Bryan,\n\nOn Wed, 31 Jul 2019, Bryan Turner wrote:\n\n> On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin\n> wrote:\n> >\n> > Hi,\n> >\n> > On Mon, 29 Jul 2019, Junio C Hamano wrote:\n> >\n> > > An early preview release Git v2.23.0-rc0 is now available for\n> > > testing at the usual places. It is comprised of 420 non-merge\n> > > commits since v2.22.0, contributed by 62 people, 23 of which are\n> > > new faces.\n> > >\n> > > The tarballs are found at:\n> > >\n> > > https://www.kernel.org/pub/software/scm/git/testing/\n> >\n> > And a corresponding Git for Windows v2.23.0-rc0 can be found here:\n> >\n> > https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1\n> >\n> > Please test!\n>\n>\n> I've run the full test suite for Bitbucket Server against 2.23.0-rc0\n> on Linux, macOS and Windows. No test failures to report.\n>\n> Thanks again for these early release candidates! They're a great\n> opportunity to test new releases in advance.\n\nThank you _so_ much for diligently testing all of them ;-)\n\nCiao,\nDscho\n"},{"id":"379784","messageId":"xmqqa7csmudm.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190801213638.GA30522@sigill.intra.peff.net","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T21:46:29Z","receivedAt":"2019-08-01T21:46:34Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jeff King writes:\n\n>> +\tif (mailmap < 0)\n>> \t\tmailmap = 0;\n>> -\t}\n>\n> This should be \"mailmap = 1\" to match the commit message, no? (Which\n> also implies we may want a new test).\n\nGaa, of course.\n\n> I'd also be OK with leaving it at \"0\" for now, making a note of the\n> upcoming change in the release notes, and flipping it _next_ time. But\n> IMHO we don't need to be that conservative (and I share your pessimism\n> that enough people actually read the release notes to merit that kind of\n> advance notice).\n\nI'd actually think s/need to be/get any benefit from being/; it\nwould be wasted effort to be extra careful, and any way we cut it,\nthere will always be people who complain.\n\n"},{"id":"379787","messageId":"xmqq5zngmtzh.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"xmqqa7csmudm.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-01T21:54:58Z","receivedAt":"2019-08-01T21:55:07Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Junio C Hamano writes:\n\n> Jeff King writes:\n>\n>>> +\tif (mailmap < 0)\n>>> \t\tmailmap = 0;\n>>> -\t}\n>>\n>> This should be \"mailmap = 1\" to match the commit message, no? (Which\n>> also implies we may want a new test).\n>\n> Gaa, of course.\n\n-- >8 --\nFrom: Junio C Hamano \nDate: Thu, 1 Aug 2019 14:48:34 -0700\nSubject: [PATCH] log: really flip the --mailmap default\n\nSigned-off-by: Junio C Hamano \n---\n builtin/log.c | 2 +-\n t/t4203-mailmap.sh | 5 +++++\n 2 files changed, 6 insertions(+), 1 deletion(-)\n\ndiff --git a/builtin/log.c b/builtin/log.c\nindex 40b4cbf57d..02fa179077 100644\n--- a/builtin/log.c\n+++ b/builtin/log.c\n@@ -205,7 +205,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \tuserformat_find_requirements(NULL, &w);\n \n \tif (mailmap < 0)\n-\t\tmailmap = 0;\n+\t\tmailmap = 1;\n \n \tif (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n \t\trev->show_notes = 1;\ndiff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh\nindex 43b1522ea2..ede0c292af 100755\n--- a/t/t4203-mailmap.sh\n+++ b/t/t4203-mailmap.sh\n@@ -461,6 +461,11 @@ test_expect_success 'Grep author with log.mailmap' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success 'log.mailmap is true by default these days' '\n+\tgit log --author Santa | grep Author >actual &&\n+\ttest_cmp expect actual\n+'\n+\n test_expect_success 'Only grep replaced author with --use-mailmap' '\n \tgit log --use-mailmap --author \"\" >actual &&\n \ttest_must_be_empty actual\n-- \n2.23.0-rc0-155-g5fbf3435fe\n\n"},{"id":"379788","messageId":"20190801221858.GN4545@pobox.com","threadId":"51549","inReplyTo":"xmqq5zngmtzh.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Todd Zullinger","fromEmail":"tmz@pobox.com","sentAt":"2019-08-01T22:18:58Z","receivedAt":"2019-08-01T22:19:04Z","isPatch":false,"sender":{"key":"tmz@pobox.com","avatar":"https://avatars.githubusercontent.com/u/806319?v=4"},"body":"Junio C Hamano wrote:\n> Junio C Hamano writes:\n> \n>> Jeff King writes:\n>>\n>>>> +\tif (mailmap < 0)\n>>>> \t\tmailmap = 0;\n>>>> -\t}\n>>>\n>>> This should be \"mailmap = 1\" to match the commit message, no? (Which\n>>> also implies we may want a new test).\n>>\n[...]\n> +test_expect_success 'log.mailmap is true by default these days' '\n> +\tgit log --author Santa | grep Author >actual &&\n> +\ttest_cmp expect actual\n> +'\n> +\n> test_expect_success 'Only grep replaced author with --use-mailmap' '\n> \tgit log --use-mailmap --author \"\" >actual &&\n> \ttest_must_be_empty actual\n\nWith log.mailmap true by default, should we also have some\ntests to ensure that --no-use-mailmap and log.mailmap=False\ndo the right thing? (I mean eventually, not necessarily\nwith this patch as extra work for you Junio.)\n\n(If I was certain the answer is \"yes\" and more familiar with\nt4203, I would have sent this in diff format.)\n\n-- \nTodd\n"},{"id":"379798","messageId":"20190802022709.GB54514@google.com","threadId":"51549","inReplyTo":"xmqqlfwcopn1.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jonathan Nieder","fromEmail":"jrnieder@gmail.com","sentAt":"2019-08-02T02:27:09Z","receivedAt":"2019-08-02T02:27:18Z","isPatch":false,"sender":{"key":"jrnieder@gmail.com","avatar":"https://avatars.githubusercontent.com/u/281595?v=4"},"body":"Junio C Hamano wrote:\n\n> I suspect that you may have misread the \"is interactive\" bit in the\n> original; that was used only to decide if we are going to warn.\n\nAh. That was indeed confusing. Anyway, it's nice to see the complexity\ngo away.\n\n[...]\n> +++ b/builtin/log.c\n[...]\n> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> \tmemset(&w, 0, sizeof(w));\n> \tuserformat_find_requirements(NULL, &w);\n> \n> -\tif (mailmap < 0) {\n> -\t\tif (session_is_interactive() && !rev->pretty_given)\n> -\t\t\twarning(\"%s\\n\", _(warn_unspecified_mailmap_msg));\n> -\n> +\tif (mailmap < 0)\n> \t\tmailmap = 0;\n\nAs Peff noticed, this should say \"mailmap = 1\" (which I see you've done\nin \"pu\"). We can simplify further by removing the \"-1\" case --- we do\nnot need to distinguish between \"on\" and \"unspecified\" any more.\n\nWe'll also want to update the docs. And as Todd suggests, we should\ncover how to disable mailmap in tests.\n\nSigned-off-by: Jonathan Nieder \n---\n\ndiff --git i/Documentation/config/log.txt w/Documentation/config/log.txt\nindex 7798e10cb0..e9e1e397f3 100644\n--- i/Documentation/config/log.txt\n+++ w/Documentation/config/log.txt\n@@ -41,4 +41,4 @@ log.showSignature::\n log.mailmap::\n \tIf true, makes linkgit:git-log[1], linkgit:git-show[1], and\n \tlinkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise\n-\tassume `--no-use-mailmap`. False by default.\n+\tassume `--no-use-mailmap`. True by default.\ndiff --git i/builtin/log.c w/builtin/log.c\nindex 02fa179077..44b10b3415 100644\n--- i/builtin/log.c\n+++ w/builtin/log.c\n@@ -47,7 +47,7 @@ static int default_follow;\n static int default_show_signature;\n static int decoration_style;\n static int decoration_given;\n-static int use_mailmap_config = -1;\n+static int use_mailmap_config = 1;\n static const char *fmt_patch_subject_prefix = \"PATCH\";\n static const char *fmt_pretty;\n \n@@ -160,7 +160,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \t\t\t struct rev_info *rev, struct setup_revision_opt *opt)\n {\n \tstruct userformat_want w;\n-\tint quiet = 0, source = 0, mailmap = 0;\n+\tint quiet = 0, source = 0, mailmap;\n \tstatic struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};\n \tstatic struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;\n \tstatic struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;\n@@ -204,9 +204,6 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n \tmemset(&w, 0, sizeof(w));\n \tuserformat_find_requirements(NULL, &w);\n \n-\tif (mailmap < 0)\n-\t\tmailmap = 1;\n-\n \tif (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n \t\trev->show_notes = 1;\n \tif (rev->show_notes)\ndiff --git i/t/t4203-mailmap.sh w/t/t4203-mailmap.sh\nindex ede0c292af..918ada69eb 100755\n--- i/t/t4203-mailmap.sh\n+++ w/t/t4203-mailmap.sh\n@@ -442,6 +442,34 @@ test_expect_success 'Log output with log.mailmap' '\n \ttest_cmp expect actual\n '\n \n+test_expect_success 'log.mailmap=false disables mailmap' '\n+\tcat >expect <<-\\EOF &&\n+\tAuthor: CTO \n+\tAuthor: claus \n+\tAuthor: santa \n+\tAuthor: nick2 \n+\tAuthor: nick2 \n+\tAuthor: nick1 \n+\tAuthor: A U Thor \n+\tEOF\n+\tgit -c log.mailmap=False log | grep Author > actual &&\n+\ttest_cmp expect actual\n+'\n+\n+test_expect_success '--no-use-mailmap disables mailmap' '\n+\tcat >expect <<-\\EOF &&\n+\tAuthor: CTO \n+\tAuthor: claus \n+\tAuthor: santa \n+\tAuthor: nick2 \n+\tAuthor: nick2 \n+\tAuthor: nick1 \n+\tAuthor: A U Thor \n+\tEOF\n+\tgit log --no-use-mailmap | grep Author > actual &&\n+\ttest_cmp expect actual\n+'\n+\n cat >expect <<\\EOF\n Author: Santa Claus \n Author: Santa Claus \n"},{"id":"379841","messageId":"xmqqblx7ld98.fsf@gitster-ct.c.googlers.com","threadId":"51549","inReplyTo":"20190802022709.GB54514@google.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2019-08-02T16:53:55Z","receivedAt":"2019-08-02T16:54:08Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jonathan Nieder writes:\n\n> We'll also want to update the docs. And as Todd suggests, we should\n> cover how to disable mailmap in tests.\n>\n> Signed-off-by: Jonathan Nieder \n> ---\n\nI avoided the \"don't bother initializing use_mailmap_config to\nunknown\" simplification, but I guess the change is clear enough.\n\n> diff --git i/Documentation/config/log.txt w/Documentation/config/log.txt\n> index 7798e10cb0..e9e1e397f3 100644\n> --- i/Documentation/config/log.txt\n> +++ w/Documentation/config/log.txt\n> @@ -41,4 +41,4 @@ log.showSignature::\n> log.mailmap::\n> \tIf true, makes linkgit:git-log[1], linkgit:git-show[1], and\n> \tlinkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise\n> -\tassume `--no-use-mailmap`. False by default.\n> +\tassume `--no-use-mailmap`. True by default.\n\nGood. Thanks for being extra careful.\n\n> diff --git i/builtin/log.c w/builtin/log.c\n> index 02fa179077..44b10b3415 100644\n> --- i/builtin/log.c\n> +++ w/builtin/log.c\n> @@ -47,7 +47,7 @@ static int default_follow;\n> static int default_show_signature;\n> static int decoration_style;\n> static int decoration_given;\n> -static int use_mailmap_config = -1;\n> +static int use_mailmap_config = 1;\n> static const char *fmt_patch_subject_prefix = \"PATCH\";\n> static const char *fmt_pretty;\n> \n> @@ -160,7 +160,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> \t\t\t struct rev_info *rev, struct setup_revision_opt *opt)\n> {\n> \tstruct userformat_want w;\n> -\tint quiet = 0, source = 0, mailmap = 0;\n> +\tint quiet = 0, source = 0, mailmap;\n> \tstatic struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};\n> \tstatic struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;\n> \tstatic struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;\n> @@ -204,9 +204,6 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,\n> \tmemset(&w, 0, sizeof(w));\n> \tuserformat_find_requirements(NULL, &w);\n> \n> -\tif (mailmap < 0)\n> -\t\tmailmap = 1;\n> -\n> \tif (!rev->show_notes_given && (!rev->pretty_given || w.notes))\n> \t\trev->show_notes = 1;\n> \tif (rev->show_notes)\n\n\n\n> diff --git i/t/t4203-mailmap.sh w/t/t4203-mailmap.sh\n> index ede0c292af..918ada69eb 100755\n> --- i/t/t4203-mailmap.sh\n> +++ w/t/t4203-mailmap.sh\n> @@ -442,6 +442,34 @@ test_expect_success 'Log output with log.mailmap' '\n> \ttest_cmp expect actual\n> '\n> \n> +test_expect_success 'log.mailmap=false disables mailmap' '\n> +\tcat >expect <<-\\EOF &&\n> +\tAuthor: CTO \n> +\tAuthor: claus \n> +\tAuthor: santa \n> +\tAuthor: nick2 \n> +\tAuthor: nick2 \n> +\tAuthor: nick1 \n> +\tAuthor: A U Thor \n> +\tEOF\n> +\tgit -c log.mailmap=False log | grep Author > actual &&\n> +\ttest_cmp expect actual\n> +'\n> +\n> +test_expect_success '--no-use-mailmap disables mailmap' '\n> +\tcat >expect <<-\\EOF &&\n> +\tAuthor: CTO \n> +\tAuthor: claus \n> +\tAuthor: santa \n> +\tAuthor: nick2 \n> +\tAuthor: nick2 \n> +\tAuthor: nick1 \n> +\tAuthor: A U Thor \n> +\tEOF\n> +\tgit log --no-use-mailmap | grep Author > actual &&\n> +\ttest_cmp expect actual\n> +'\n> +\n> cat >expect <<\\EOF\n> Author: Santa Claus \n> Author: Santa Claus \n"},{"id":"379843","messageId":"20190802183529.GA26918@sigill.intra.peff.net","threadId":"51549","inReplyTo":"xmqqblx7ld98.fsf@gitster-ct.c.googlers.com","subject":"Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2019-08-02T18:35:29Z","receivedAt":"2019-08-02T18:35:31Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Fri, Aug 02, 2019 at 09:53:55AM -0700, Junio C Hamano wrote:\n\n> Jonathan Nieder writes:\n> \n> > We'll also want to update the docs. And as Todd suggests, we should\n> > cover how to disable mailmap in tests.\n> >\n> > Signed-off-by: Jonathan Nieder \n> > ---\n> \n> I avoided the \"don't bother initializing use_mailmap_config to\n> unknown\" simplification, but I guess the change is clear enough.\n\nYeah, I didn't even look to see if there were further simplifications\npossible, but seeing Jonathan's patch, it looks like an obvious\nimprovement. And a quick grep shows that there are no other sites that\nshould be affected by losing the \"-1\" semantics, so I think it's a good\nidea.\n\nAnd of course the doc and test improvements are very welcome. :)\n\n-Peff\n"}]}