[ANNOUNCE] Git v2.23.0-rc0

[ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

An early preview release Git v2.23.0-rc0 is now available for
testing at the usual places.  It is comprised of 420 non-merge
commits since v2.22.0, contributed by 62 people, 23 of which are
new faces.

The tarballs are found at:

    https://www.kernel.org/pub/software/scm/git/testing/

The following public repositories all have a copy of the
'v2.23.0-rc0' tag and the 'master' branch that the tag points at:

  url = https://kernel.googlesource.com/pub/scm/git/git
  url = git://repo.or.cz/alt-git.git
  url = https://github.com/gitster/git

New contributors whose contributions weren't in v2.22.0 are as follows.
Welcome to the Git development community!

  Ariadne Conill, Barret Rhoden, Ben Avison, Daniel Ferreira, Doug
  Ilijev, Dr. Adam Nielsen, Jakub Wilk, John Lin, Matheus Tavares,
  Mazo, Andrey, Michael Osipov, Michael Platings, Miguel Ojeda,
  Mike Mueller, Morian Sonnet, Quentin Nerden, Robert Morgan,
  Simon Williams, Steven Roberts, Tigran Mkrtchyan, Varun Naik,
  Vishal Verma, and Xin Li.

Returning contributors who helped this release are as follows.
Thanks for your continued support.

  Ævar Arnfjörð Bjarmason, Beat Bolli, Boxuan Li, Carlo Marcelo
  Arenas Belón, Cesar Eduardo Barros, Chris Mayo, Christian
  Couder, Denton Liu, Derrick Stolee, Dimitriy Ryazantcev,
  Edmundo Carmona Antoranz, Elijah Newren, Emily Shaffer, Eric
  Wong, Felipe Contreras, Jeff Hostetler, Jeff King, Johannes
  Schindelin, Johannes Sixt, Jonathan Tan, Josh Steadmon, Junio
  C Hamano, Karsten Blees, Marc-André Lureau, Martin Ågren,
  Matthew DeVore, Mike Hommey, Nguyễn Thái Ngọc Duy, Nickolai
  Belakovski, Paolo Bonzini, Philip Oakley, Phillip Wood, Ramsay
  Jones, René Scharfe, Rohit Ashiwal, Stephen Boyd, SZEDER Gábor,
  Taylor Blau, and Thomas Gummerer.

----------------------------------------------------------------

Git 2.23 Release Notes (draft)
==============================

Updates since v2.22
-------------------

Backward compatibility note

 * The "--base" option of "format-patch" computed the patch-ids for
   prerequisite patches in an unstable way, which has been updated to
   compute in a way that is compatible with "git patch-id --stable".


UI, Workflows & Features

 * The "git fast-export/import" pair has been taught to handle commits
   with log messages in encoding other than UTF-8 better.

 * In recent versions of Git, per-worktree refs are exposed in
   refs/worktrees/<wtname>/ hierarchy, which means that worktree names
   must be a valid refname component.  The code now sanitizes the names
   given to worktrees, to make sure these refs are well-formed.

 * "git merge" learned "--quit" option that cleans up the in-progress
   merge while leaving the working tree and the index still in a mess.

 * "git format-patch" learns a configuration to set the default for
   its --notes=<ref> option.

 * The code to show args with potential typo that cannot be
   interpreted as a commit-ish has been improved.

 * "git clone --recurse-submodules" learned to set up the submodules
   to ignore commit object names recorded in the superproject gitlink
   and instead use the commits that happen to be at the tip of the
   remote-tracking branches from the get-go, by passing the new
   "--remote-submodules" option.

 * The pattern "git diff/grep" use to extract funcname and words
   boundary for Matlab has been extend to cover Octave, which is more
   or less equivalent.

 * "git help git" was hard to discover (well, at least for some
   people).

 * The pattern "git diff/grep" use to extract funcname and words
   boundary for Rust has been added.

 * "git status" can be told a non-standard default value for the
   "--[no-]ahead-behind" option with a new configuration variable
   status.aheadBehind.

 * "git fetch" and "git pull" reports when a fetch results in
   non-fast-forward updates to let the user notice unusual situation.
   The commands learned "--no-shown-forced-updates" option to disable
   this safety feature.

 * Two new commands "git switch" and "git restore" are introduced to
   split "checking out a branch to work on advancing its history" and
   "checking out paths out of the index and/or a tree-ish to work on
   advancing the current history" out of the single "git checkout"
   command.

 * "git branch --list" learned to always output the detached HEAD as
   the first item (when the HEAD is detached, of course), regardless
   of the locale.

 * The conditional inclusion mechanism learned to base the choice on
   the branch the HEAD currently is on.

 * "git rev-list --objects" learned with "--no-object-names" option to
   squelch the path to the object that is used as a grouping hint for
   pack-objects.

 * A new tag.gpgSign configuration variable turns "git tag -a" into
   "git tag -s".

 * "git multi-pack-index" learned expire and repack subcommands.

 * "git blame" learned to "ignore" commits in the history, whose
   effects (as well as their presence) get ignored.

 * "git cherry-pick/revert" learned a new "--skip" action.

 * The tips of refs from the alternate object store can be used as
   starting point for reachability computation now.

 * Extra blank lines in "git status" output have been reduced.

 * The commits in a repository can be described by multiple
   commit-graph files now, which allows the commit-graph files to be
   updated incrementally.

 * The "git log" command learns to issue a warning when log.mailmap
   configuration is not set and --[no-]mailmap option is not used, to
   prepare users for future versions of Git that uses the mailmap by
   default.

 * "git range-diff" output has been tweaked for easier identification
   of which part of what file the patch shown is about.


Performance, Internal Implementation, Development Support etc.

 * Update supporting parts of "git rebase" to remove code that should
   no longer be used.

 * Developer support to emulate unsatisfied prerequisites in tests to
   ensure that the remainer of the tests still succeeds when tests
   with prerequisites are skipped.

 * "git update-server-info" learned not to rewrite the file with the
   same contents.

 * The way of specifying the path to find dynamic libraries at runtime
   has been simplified.  The old default to pass -R/path/to/dir has been
   replaced with the new default to pass -Wl,-rpath,/path/to/dir,
   which is the more recent GCC uses.  Those who need to build with an
   old GCC can still use "CC_LD_DYNPATH=-R"

 * Prepare use of reachability index in topological walker that works
   on a range (A..B).

 * A new tutorial targetting specifically aspiring git-core
   developers has been added.

 * Auto-detect how to tell HP-UX aCC where to use dynamically linked
   libraries from at runtime.

 * "git mergetool" and its tests now spawn fewer subprocesses.

 * Dev support update to help tracing out tests.

 * Support to build with MSVC has been updated.

 * "git fetch" that grabs from a group of remotes learned to run the
   auto-gc only once at the very end.

 * A handful of Windows build patches have been upstreamed.

 * The code to read state files used by the sequencer machinery for
   "git status" has been made more robust against a corrupt or stale
   state files.

 * "git for-each-ref" with multiple patterns have been optimized.

 * The tree-walk API learned to pass an in-core repository
   instance throughout more codepaths.

 * When one step in multi step cherry-pick or revert is reset or
   committed, the command line prompt script failed to notice the
   current status, which has been improved.

 * Many GIT_TEST_* environment variables control various aspects of
   how our tests are run, but a few followed "non-empty is true, empty
   or unset is false" while others followed the usual "there are a few
   ways to spell true, like yes, on, etc., and also ways to spell
   false, like no, off, etc." convention.

 * Adjust the dir-iterator API and apply it to the local clone
   optimization codepath.

 * We have been trying out a few language features outside c89; the
   coding guidelines document did not talk about them and instead had
   a blanket ban against them.
   (merge cc0c42975a jc/post-c89-rules-doc later to maint).

 * A test helper has been introduced to optimize preparation of test
   repositories with many simple commits, and a handful of test
   scripts have been updated to use it.


Fixes since v2.22
-----------------

 * A relative pathname given to "git init --template=<path> <repo>"
   ought to be relative to the directory "git init" gets invoked in,
   but it instead was made relative to the repository, which has been
   corrected.
   (merge e1df7fe43f nd/init-relative-template-fix later to maint).

 * "git worktree add" used to fail when another worktree connected to
   the same repository was corrupt, which has been corrected.
   (merge 105df73e71 nd/corrupt-worktrees later to maint).

 * The ownership rule for the file descriptor to fast-import remote
   backend was mixed up, leading to unrelated file descriptor getting
   closed, which has been fixed.
   (merge 3203566a71 mh/import-transport-fd-fix later to maint).

 * A "merge -c" instruction during "git rebase --rebase-merges" should
   give the user a chance to edit the log message, even when there is
   otherwise no need to create a new merge and replace the existing
   one (i.e. fast-forward instead), but did not.  Which has been
   corrected.

 * Code cleanup and futureproof.
   (merge 31f5256c82 ds/object-info-for-prefetch-fix later to maint).

 * More parameter validation.
   (merge de99eb0c24 es/grep-require-name-when-needed later to maint).

 * "git update-server-info" used to leave stale packfiles in its
   output, which has been corrected.
   (merge e941c48d49 ew/server-info-remove-crufts later to maint).

 * The server side support for "git fetch" used to show incorrect
   value for the HEAD symbolic ref when the namespace feature is in
   use, which has been corrected.
   (merge 533e088250 jk/HEAD-symref-in-xfer-namespaces later to maint).

 * "git am -i --resolved" segfaulted after trying to see a commit as
   if it were a tree, which has been corrected.
   (merge 7663e438c5 jk/am-i-resolved-fix later to maint).

 * "git bundle verify" needs to see if prerequisite objects exist in
   the receiving repository, but the command did not check if we are
   in a repository upfront, which has been corrected.
   (merge 3bbbe467f2 js/bundle-verify-require-object-store later to maint).

 * "git merge --squash" is designed to update the working tree and the
   index without creating the commit, and this cannot be countermanded
   by adding the "--commit" option; the command now refuses to work
   when both options are given.
   (merge 1d14d0c994 vv/merge-squash-with-explicit-commit later to maint).

 * The data collected by fsmonitor was not properly written back to
   the on-disk index file, breaking t7519 tests occasionally, which
   has been corrected.
   (merge b5a8169752 js/fsmonitor-unflake later to maint).

 * Update to Unicode 12.1 width table.
   (merge 5817f9caa3 bb/unicode-12.1-reiwa later to maint).

 * The command line to invoke a "git cat-file" command from inside
   "git p4" was not properly quoted to protect a caret and running a
   broken command on Windows, which has been corrected.
   (merge c3f2358de3 mm/p4-unshelve-windows-fix later to maint).

 * "git request-pull" learned to warn when the ref we ask them to pull
   from in the local repository and in the published repository are
   different.
   (merge 0454220d66 pb/request-pull-verify-remote-ref later to maint).

 * When creating a partial clone, the object filtering criteria is
   recorded for the origin of the clone, but this incorrectly used a
   hardcoded name "origin" to name that remote; it has been corrected
   to honor the "--origin <name>" option.
   (merge 1c4a9f9114 xl/record-partial-clone-origin later to maint).

 * "git fetch" into a lazy clone forgot to fetch base objects that are
   necessary to complete delta in a thin packfile, which has been
   corrected.
   (merge 810e19322d jt/partial-clone-missing-ref-delta-base later to maint).

 * The filter_data used in the list-objects-filter (which manages a
   lazily sparse clone repository) did not use the dynamic array API
   correctly---'nr' is supposed to point at one past the last element
   of the array in use.  This has been corrected.
   (merge 7140600e2e md/list-objects-filter-memfix later to maint).

 * The description about slashes in gitignore patterns (used to
   indicate things like "anchored to this level only" and "only
   matches directories") has been revamped.
   (merge 1a58bad014 an/ignore-doc-update later to maint).

 * The URL decoding code has been updated to avoid going past the end
   of the string while parsing %-<hex>-<hex> sequence.
   (merge d37dc239a4 md/url-parse-harden later to maint).

 * The list of for-each like macros used by clang-format has been
   updated.
   (merge fc7e03aace mo/clang-format-for-each-update later to maint).

 * "git branch --list" learned to show branches that are checked out
   in other worktrees connected to the same repository prefixed with
   '+', similar to the way the currently checked out branch is shown
   with '*' in front.
   (merge 6e9381469e nb/branch-show-other-worktrees-head later to maint).

 * Code restructuring during 2.20 period broke fetching tags via
   "import" based transports.
   (merge f80d922355 fc/fetch-with-import-fix later to maint).

 * The commit-graph file is now part of the "files that the runtime
   may keep open file descriptors on, all of which would need to be
   closed when done with the object store", and the file descriptor to
   an existing commit-graph file now is closed before "gc" finalizes a
   new instance to replace it.
   (merge 2d511cfc0b ds/close-object-store later to maint).

 * "git checkout -p" needs to selectively apply a patch in reverse,
   which did not work well.
   (merge 2bd69b9024 pw/add-p-recount later to maint).

 * Code clean-up to avoid signed integer wraparounds during binary search.
   (merge 568a05c5ec rs/avoid-overflow-in-midpoint-computation later to maint).

 * "git interpret-trailers" always treated '#' as the comment
   character, regardless of core.commentChar setting, which has been
   corrected.
   (merge 29c83fc23f jk/trailers-use-config later to maint).

 * "git stash show 23" used to work, but no more after getting
   rewritten in C; this regression has been corrected.
   (merge 63b50c8ffe tg/stash-ref-by-index-fix later to maint).

 * "git rebase --abort" used to leave refs/rewritten/ when concluding
   "git rebase -r", which has been corrected.
   (merge d559f502c5 pw/rebase-abort-clean-rewritten later to maint).

 * An incorrect list of options was cached after command line
   completion failed (e.g. trying to complete a command that requires
   a repository outside one), which has been corrected.
   (merge 69702523af nd/completion-no-cache-failure later to maint).

 * The code to parse scaled numbers out of configuration files has
   been made more robust and also easier to follow.
   (merge 39c575c969 rs/config-unit-parsing later to maint).

 * The codepath to compute delta islands used to spew progress output
   without giving the callers any way to squelch it, which has been
   fixed.
   (merge bdbdf42f8a jk/delta-islands-progress-fix later to maint).

 * Protocol capabilities that go over wire should never be translated,
   but it was incorrectly marked for translation, which has been
   corrected.  The output of protocol capabilities for debugging has
   been tweaked a bit.

 * Use "Erase in Line" CSI sequence that is already used in the editor
   support to clear cruft in the progress output.
   (merge 5b12e3123b sg/rebase-progress later to maint).

 * "git submodule foreach" did not protect command line options passed
   to the command to be run in each submodule correctly, when the
   "--recursive" option was in use.
   (merge 30db18b148 ms/submodule-foreach-fix later to maint).

 * The configuration variable rebase.rescheduleFailedExec should be
   effective only while running an interactive rebase and should not
   affect anything when running an non-interactive one, which was not
   the case.  This has been corrected.
   (merge 906b63942a js/rebase-reschedule-applies-only-to-interactive later to maint).

 * The "git clone" documentation refers to command line options in its
   description in the short form; they have been replaced with long
   forms to make them more recognisable.
   (merge bfc8c84ed5 qn/clone-doc-use-long-form later to maint).

 * Generation of pack bitmaps are now disabled when .keep files exist,
   as these are mutually exclusive features.
   (merge 7328482253 ew/repack-with-bitmaps-by-default later to maint).

 * "git rm" to resolve a conflicted path leaked an internal message
   "needs merge" before actually removing the path, which was
   confusing.  This has been corrected.
   (merge b2b1f615ce jc/denoise-rm-to-resolve later to maint).

 * "git stash --keep-index" did not work correctly on paths that have
   been removed, which has been fixed.
   (merge b932f6a5e8 tg/stash-keep-index-with-removed-paths later to maint).

 * Window 7 update ;-)
   (merge eb7c786314 js/mingw-spawn-with-spaces-in-path later to maint).

 * A codepath that reads from GPG for signed object verification read
   past the end of allocated buffer, which has been fixed.
   (merge 64c45dc72e sr/gpg-interface-stop-at-the-end later to maint).

 * "git clean" silently skipped a path when it cannot lstat() it; now
   it gives a warning.
   (merge b09364c47a js/clean-report-too-long-a-path later to maint).

 * "git push --atomic" that goes over the transport-helper (namely,
   the smart http transport) failed to prevent refs to be pushed when
   it can locally tell that one of the ref update will fail without
   having to consult the other end, which has been corrected.
   (merge 2581ea3d31 es/local-atomic-push-failure-with-http later to maint).

 * The internal diff machinery can be made to read out of bounds while
   looking for --funcion-context line in a corner case, which has been
   corrected.
   (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).

 * Other code cleanup, docfix, build fix, etc.
   (merge f547101b26 es/git-debugger-doc later to maint).
   (merge 7877ac3d7b js/bisect-helper-check-get-oid-return-value later to maint).
   (merge 0108f47eb3 sw/git-p4-unshelve-branched-files later to maint).
   (merge 9df8f734fd cm/send-email-document-req-modules later to maint).
   (merge afc3bf6eb1 ab/hash-object-doc later to maint).
   (merge 1fde99cfc7 po/doc-branch later to maint).
   (merge 459842e1c2 dl/config-alias-doc later to maint).
   (merge 5d137fc2c7 cb/fsmonitor-intfix later to maint).
   (merge 921d49be86 rs/copy-array later to maint).
   (merge cc8d872e69 js/t3404-typofix later to maint).
   (merge 729a9b558b cb/mkstemps-uint-type-fix later to maint).
   (merge 9dae4fe79f js/gcc-8-and-9 later to maint).
   (merge ed33bd8f30 js/t0001-case-insensitive later to maint).
   (merge dfa880e336 jw/gitweb-sample-update later to maint).
   (merge e532a90a9f sg/t5551-fetch-smart-error-is-translated later to maint).
   (merge 8d45ad8c29 jt/t5551-test-chunked later to maint).
   (merge 1a64e07d23 sg/git-C-empty-doc later to maint).
   (merge 37a2e35395 sg/ci-brew-gcc-workaround later to maint).
   (merge 24df0d49c4 js/trace2-signo-typofix later to maint).
   (merge fbec05c210 cc/test-oidmap later to maint).
   (merge 7926cee904 di/readme-markup-fix later to maint).
   (merge 02638d1e11 vn/xmmap-gently later to maint).
   (merge f7bf24d4dd rm/gpg-program-doc-fix later to maint).
   (merge 3aef54e8b8 js/unmap-before-ext-diff later to maint).

----------------------------------------------------------------

Changes since v2.22.0 are as follows:

Ariadne Conill (3):
      log: add warning for unspecified log.mailmap setting
      documentation: mention --no-use-mailmap and log.mailmap false setting
      tests: defang pager tests by explicitly disabling the log.mailmap warning

Barret Rhoden (8):
      fsck: rename and touch up init_skiplist()
      Move oidset_parse_file() to oidset.c
      blame: use a helper function in blame_chunk()
      blame: add the ability to ignore commits and their changes
      blame: add config options for the output of ignored or unblamable lines
      blame: optionally track line fingerprints during fill_blame_origin()
      blame: use the fingerprint heuristic to match ignored lines
      blame: add a test to cover blame_coalesce()

Beat Bolli (2):
      unicode: update the width tables to Unicode 12.1
      grep: print the pcre2_jit_on value

Ben Avison (1):
      clone: add `--remote-submodules` flag

Boxuan Li (2):
      userdiff: add Octave
      userdiff: fix grammar and style issues

Carlo Marcelo Arenas Belón (3):
      fsmonitor: avoid signed integer overflow / infinite loop
      wrapper: avoid undefined behaviour in macOS
      trace2: correct typo in technical documentation

Cesar Eduardo Barros (1):
      mingw: embed a manifest to trick UAC into Doing The Right Thing

Chris Mayo (1):
      send-email: update documentation of required Perl modules

Christian Couder (7):
      t/helper: add test-oidmap.c
      t: add t0016-oidmap.sh
      oidmap: use sha1hash() instead of static hash() function
      test-hashmap: remove 'hash' command
      doc: improve usage string in MyFirstContribution
      test-oidmap: remove 'add' subcommand
      t0016: add 'remove' subcommand test

Daniel Ferreira (1):
      dir-iterator: add tests for dir-iterator API

Denton Liu (5):
      git-format-patch.txt: document --no-notes option
      format-patch: teach format.notes config option
      config: learn the "onbranch:" includeIf condition
      config/alias.txt: change " and ' to `
      config/alias.txt: document alias accepting non-command first word

Derrick Stolee (50):
      commit-graph: fix the_repository reference
      revision: use generation for A..B --topo-order queries
      revision: keep topo-walk free of unintersting commits
      sha1-file: split OBJECT_INFO_FOR_PREFETCH
      repack: refactor pack deletion for future use
      Docs: rearrange subcommands for multi-pack-index
      multi-pack-index: prepare for 'expire' subcommand
      midx: simplify computation of pack name lengths
      midx: refactor permutation logic and pack sorting
      multi-pack-index: implement 'expire' subcommand
      multi-pack-index: prepare 'repack' subcommand
      midx: implement midx_repack()
      multi-pack-index: test expire while adding packs
      midx: add test that 'expire' respects .keep files
      t5319-multi-pack-index.sh: test batch size zero
      commit-graph: return with errors during write
      commit-graph: collapse parameters into flags
      commit-graph: remove Future Work section
      commit-graph: create write_commit_graph_context
      commit-graph: extract fill_oids_from_packs()
      commit-graph: extract fill_oids_from_commit_hex()
      commit-graph: extract fill_oids_from_all_packs()
      commit-graph: extract count_distinct_commits()
      commit-graph: extract copy_oids_to_commits()
      commit-graph: extract write_commit_graph_file()
      commit-graph: use raw_object_store when closing
      packfile: close commit-graph in close_all_packs
      packfile: rename close_all_packs to close_object_store
      commit-graph: document commit-graph chains
      commit-graph: prepare for commit-graph chains
      commit-graph: rename commit_compare to oid_compare
      commit-graph: load commit-graph chains
      commit-graph: add base graphs chunk
      commit-graph: rearrange chunk count logic
      commit-graph: write commit-graph chains
      commit-graph: add --split option to builtin
      commit-graph: merge commit-graph chains
      commit-graph: allow cross-alternate chains
      commit-graph: expire commit-graph files
      commit-graph: create options for split files
      commit-graph: verify chains with --shallow mode
      commit-graph: clean up chains after flattened write
      commit-graph: test octopus merges with --split
      commit-graph: test --split across alternate without --split
      commit-graph: normalize commit-graph filenames
      commit-graph: test verify across alternates
      fetch: add --[no-]show-forced-updates argument
      fetch: warn about forced updates in branch listing
      pull: add --[no-]show-forced-updates passthrough
      t5319: use 'test-tool path-utils' instead of 'ls -l'

Dimitriy Ryazantcev (1):
      l10n: localizable upload progress messages

Doug Ilijev (1):
      README: fix rendering of text in angle brackets

Dr. Adam Nielsen (1):
      gitignore.txt: make slash-rules more readable

Edmundo Carmona Antoranz (1):
      builtin/merge.c - cleanup of code in for-cycle that tests strategies

Elijah Newren (5):
      t9350: fix encoding test to actually test reencoding
      fast-import: support 'encoding' commit header
      fast-export: avoid stripping encoding header if we cannot reencode
      fast-export: differentiate between explicitly UTF-8 and implicitly UTF-8
      fast-export: do automatic reencoding of commit messages only if requested

Emily Shaffer (7):
      documentation: add tutorial for first contribution
      documentation: add anchors to MyFirstContribution
      grep: fail if call could output and name is null
      doc: hint about GIT_DEBUGGER in CodingGuidelines
      doc: add some nit fixes to MyFirstContribution
      rev-list: teach --no-object-names to enable piping
      transport-helper: enforce atomic in push_refs_with_push

Eric Wong (3):
      update-server-info: avoid needless overwrites
      server-info: do not list unlinked packs
      repack: disable bitmaps-by-default if .keep files exist

Felipe Contreras (5):
      t5801 (remote-helpers): cleanup refspec stuff
      t5801 (remote-helpers): add test to fetch tags
      fetch: trivial cleanup
      fetch: make the code more understandable
      fetch: fix regression with transport helpers

Jakub Wilk (1):
      doc: don't use git.kernel.org as example gitweb URL

Jeff Hostetler (13):
      cache-tree/blame: avoid reusing the DEBUG constant
      msvc: mark a variable as non-const
      msvc: do not re-declare the timespec struct
      msvc: define ftello()
      msvc: fix detect_msys_tty()
      msvc: update Makefile to allow for spaces in the compiler path
      status: add status.aheadbehind setting
      status: warn when a/b calculation takes too long
      status: ignore status.aheadbehind in porcelain formats
      msvc: support building Git using MS Visual C++
      msvc: add a compile-time flag to allow detailed heap debugging
      msvc: do not pretend to support all signals
      msvc: ignore .dll and incremental compile output

Jeff King (50):
      cmd_{read,write}_tree: rename "unused" variable that is used
      builtin: consistently pass cmd_* prefix to parse_options
      submodule: drop unused prefix parameter from some functions
      clone: drop dest parameter from copy_alternates()
      read-cache: drop unused parameter from threaded load
      wt-status: drop unused status parameter
      mktree: drop unused length parameter
      name-rev: drop unused parameters from is_better_name()
      pack-objects: drop unused rev_info parameters
      receive-pack: drop unused "commands" from prepare_shallow_update()
      remove_all_fetch_refspecs(): drop unused "remote" parameter
      rev-list: drop unused void pointer from finish_commit()
      show-branch: drop unused parameter from show_independent()
      verify-commit: simplify parameters to run_gpg_verify()
      help_unknown_ref(): duplicate collected refnames
      help_unknown_ref(): check for refname ambiguity
      upload-pack: strip namespace from symref data
      am: simplify prompt response handling
      am: read interactive input from stdin
      am: drop tty requirement for --interactive
      am: fix --interactive HEAD tree resolution
      interpret-trailers: load default config
      describe: fix accidental oid/hash type-punning
      upload-pack: rename a "sha1" variable to "oid"
      pack-bitmap-write: convert some helpers to use object_id
      pack-objects: convert packlist_find() to use object_id
      pack-objects: convert locate_object_entry_hash() to object_id
      object: convert lookup_unknown_object() to use object_id
      object: convert lookup_object() to use object_id
      object: convert internal hash_obj() to object_id
      object: convert create_object() to use object_id
      khash: drop broken oid_map typedef
      khash: rename kh_oid_t to kh_oid_set
      delta-islands: convert island_marks khash to use oids
      pack-bitmap: convert khash_sha1 maps into kh_oid_map
      khash: drop sha1-specific map types
      khash: rename oid helper functions
      hash.h: move object_id definition from cache.h
      hashmap: convert sha1hash() to oidhash()
      delta-islands: respect progress flag
      blame: drop some unused function parameters
      object-store.h: move for_each_alternate_ref() from transport.h
      check_everything_connected: assume alternate ref tips are valid
      test-lib: introduce test_commit_bulk
      t5310: increase the number of bitmapped commits
      t3311: use test_commit_bulk
      t5702: use test_commit_bulk
      t5703: use test_commit_bulk
      t6200: use test_commit_bulk
      xdiff: clamp function context indices in post-image

Johannes Schindelin (32):
      Drop unused git-rebase--am.sh
      t3400: stop referring to the scripted rebase
      .gitignore: there is no longer a built-in `git-rebase--interactive`
      sequencer: the `am` and `rebase--interactive` scripts are gone
      rebase: fold git-rebase--common into the -p backend
      bisect--helper: verify HEAD could be parsed before continuing
      fill_stat_cache_info(): prepare for an fsmonitor fix
      mark_fsmonitor_valid(): mark the index as changed if needed
      bundle verify: error out if called without an object database
      poll (mingw): allow compiling with GCC 8 and DEVELOPER=1
      kwset: allow building with GCC 8
      winansi: simplify loading the GetCurrentConsoleFontEx() function
      config: avoid calling `labs()` on too-large data type
      t3404: fix a typo
      mingw: fix a typo in the msysGit-specific section
      Mark .bat files as requiring CR/LF endings
      t0001 (mingw): do not expect a specific order of stdout/stderr
      obstack: fix compiler warning
      mingw: replace mingw_startup() hack
      msvc: fix dependencies of compat/msvc.c
      t0001: fix on case-insensitive filesystems
      msvc: avoid debug assertion windows in Debug Mode
      mingw: enable stack smashing protector
      mingw: get pw_name in UTF-8 format
      mingw: use Unicode functions explicitly
      rebase --am: ignore rebase.rescheduleFailedExec
      mingw: fix possible buffer overrun when calling `GetUserNameW()`
      diff: munmap() file contents before running external diff
      mingw: support spawning programs containing spaces in their names
      clean: show an error message when the path is too long
      rebase: fix white-space
      git: mark cmd_rebase as requiring a worktree

Johannes Sixt (5):
      userdiff: two simplifications of patterns for rust
      t7610-mergetool: do not place pipelines headed by `yes` in subshells
      t7610-mergetool: use test_cmp instead of test $(cat file) = $txt
      mergetool: dissect strings with shell variable magic instead of `expr`
      mergetool: use shell variable magic instead of `awk`

John Lin (1):
      status: remove the empty line after hints

Jonathan Tan (5):
      t5616: refactor packfile replacement
      index-pack: prefetch missing REF_DELTA bases
      t5616: use correct flag to check object is missing
      t5616: cover case of client having delta base
      t5551: test usage of chunked encoding explicitly

Josh Steadmon (1):
      trace2: correct trace2 field name documentation

Junio C Hamano (13):
      The first batch after 2.22
      The second batch
      The third batch
      The fourth batch
      The fifth batch
      transport-helper: avoid var decl in for () loop control
      rm: resolving by removal is not a warning-worthy event
      CodingGuidelines: spell out post-C89 rules
      The sixth batch
      The seventh batch
      Flush fixes up to the third batch post 2.22.0
      Merge fixes made on the 'master' front
      Git 2.23-rc0

Karsten Blees (2):
      gettext: always use UTF-8 on native Windows
      mingw: initialize HOME on startup

Marc-André Lureau (1):
      userdiff: add built-in pattern for rust

Martin Ågren (1):
      ref-filter: fix memory leak in `free_array_item()`

Matheus Tavares (8):
      clone: better handle symlinked files at .git/objects/
      dir-iterator: use warning_errno when possible
      dir-iterator: refactor state machine model
      dir-iterator: add flags parameter to dir_iterator_begin
      clone: copy hidden paths at local clone
      clone: extract function from copy_or_link_directory
      clone: use dir-iterator to avoid explicit dir traversal
      clone: replace strcmp by fspathcmp

Matthew DeVore (5):
      list-objects-filter-options: error is localizeable
      list-objects-filter: correct usage of ALLOC_GROW
      url: do not read past end of buffer
      url: do not allow %00 to represent NUL in URLs
      ref-filter: sort detached HEAD lines firstly

Mazo, Andrey (8):
      git-p4: detect/prevent infinite loop in gitCommitByP4Change()
      git-p4: add failing test for "git-p4: match branches case insensitively if configured"
      git-p4: match branches case insensitively if configured
      git-p4: don't groom exclude path list on every commit
      git-p4: add failing test for "don't exclude other files with same prefix"
      git-p4: don't exclude other files with same prefix
      git-p4: add failing test for "git-p4: respect excluded paths when detecting branches"
      git-p4: respect excluded paths when detecting branches

Michael Osipov (1):
      configure: Detect linking style for HP aCC on HP-UX

Michael Platings (2):
      blame: add a fingerprint heuristic to match ignored lines
      t8014: remove unnecessary braces

Miguel Ojeda (1):
      clang-format: use git grep to generate the ForEachMacros list

Mike Hommey (2):
      dup() the input fd for fast-import used for remote helpers
      Use xmmap_gently instead of xmmap in use_pack

Mike Mueller (1):
      p4 unshelve: fix "Not a valid object name HEAD0" on Windows

Morian Sonnet (1):
      submodule foreach: fix recursion of options

Nguyễn Thái Ngọc Duy (63):
      git-checkout.txt: spell out --no-option
      git-checkout.txt: fix one syntax line
      doc: document --overwrite-ignore
      git-checkout.txt: fix monospace typeset
      t: rename t2014-switch.sh to t2014-checkout-switch.sh
      checkout: advice how to get out of detached HEAD mode
      checkout: inform the user when removing branch state
      checkout: keep most #include sorted
      checkout: factor out some code in parse_branchname_arg()
      checkout: make "opts" in cmd_checkout() a pointer
      checkout: move 'confict_style' and 'dwim_..' to checkout_opts
      checkout: split options[] array in three pieces
      checkout: split part of it to new command 'switch'
      switch: better names for -b and -B
      switch: add --discard-changes
      switch: remove -l
      switch: stop accepting pathspec
      switch: reject "do nothing" case
      switch: only allow explicit detached HEAD
      switch: add short option for --detach
      switch: implicit dwim, use --no-guess to disable it
      switch: no worktree status unless real branch switch happens
      switch: reject if some operation is in progress
      switch: make --orphan switch to an empty tree
      t: add tests for switch
      completion: support switch
      doc: promote "git switch"
      checkout: split part of it to new command 'restore'
      restore: take tree-ish from --source option instead
      restore: make pathspec mandatory
      restore: disable overlay mode by default
      checkout: factor out worktree checkout code
      restore: add --worktree and --staged
      restore: reject invalid combinations with --staged
      restore: default to --source=HEAD when only --staged is specified
      restore: replace --force with --ignore-unmerged
      restore: support --patch
      t: add tests for restore
      completion: support restore
      user-manual.txt: prefer 'merge --abort' over 'reset --hard'
      doc: promote "git restore"
      help: move git-diff and git-reset to different groups
      Declare both git-switch and git-restore experimental
      merge: remove drop_save() in favor of remove_merge_branch_state()
      init: make --template path relative to $CWD
      worktree add: sanitize worktree names
      worktree add: be tolerant of corrupt worktrees
      merge: add --quit
      completion: do not cache if --git-completion-helper fails
      fetch: only run 'gc' once when fetching multiple remotes
      t2027: use test_must_be_empty
      switch: allow to switch in the middle of bisect
      completion: disable dwim on "git switch -d"
      fetch-pack: move capability names out of i18n strings
      fetch-pack: print all relevant supported capabilities with -v -v
      fetch-pack: print server version at the top in -v -v
      sha1-file.c: remove the_repo from read_object_with_reference()
      tree-walk.c: remove the_repo from fill_tree_descriptor()
      tree-walk.c: remove the_repo from get_tree_entry()
      tree-walk.c: remove the_repo from get_tree_entry_follow_symlinks()
      match-trees.c: remove the_repo from shift_tree*()
      Use the right 'struct repository' instead of the_repository
      t7814: do not generate same commits in different repos

Nickolai Belakovski (3):
      ref-filter: add worktreepath atom
      branch: update output to include worktree info
      branch: add worktree info on verbose output

Paolo Bonzini (2):
      request-pull: quote regex metacharacters in local ref
      request-pull: warn if the remote object is not the same as the local one

Philip Oakley (6):
      git.c: show usage for accessing the git(1) help page
      Doc: git.txt: remove backticks from link and add git-scm.com/docs
      doc branch: provide examples for listing remote tracking branches
      msvc: include sigset_t definition
      msvc: define O_ACCMODE
      msvc: add pragmas for common warnings

Phillip Wood (12):
      rebase: fix a memory leak
      rebase: warn if state directory cannot be removed
      sequencer: return errors from sequencer_remove_state()
      rebase --abort/--quit: cleanup refs/rewritten
      rebase -r: always reword merge -c
      add -p: fix checkout -p with pathological context
      show --continue/skip etc. consistently in synopsis
      sequencer: always allow tab after command name
      sequencer: factor out todo command name parsing
      status: do not report errors in sequencer/todo
      git-prompt: improve cherry-pick/revert detection
      t3420: remove progress lines before comparing output

Quentin Nerden (2):
      docs: git-clone: refer to long form of options
      docs: git-clone: list short form of options first

Ramsay Jones (1):
      env--helper: mark a file-local symbol as static

René Scharfe (6):
      cleanup: fix possible overflow errors in binary search, part 2
      coccinelle: use COPY_ARRAY for copying arrays
      use COPY_ARRAY for copying arrays
      config: use unsigned_mult_overflows to check for overflows
      config: don't multiply in parse_unit_factor()
      config: simplify parsing of unit factors

Robert Morgan (1):
      gpg(docs): use correct --verify syntax

Rohit Ashiwal (5):
      sequencer: add advice for revert
      sequencer: rename reset_for_rollback to reset_merge
      sequencer: use argv_array in reset_merge
      cherry-pick/revert: add --skip option
      cherry-pick/revert: advise using --skip

SZEDER Gábor (11):
      t3404: modernize here doc style
      t3404: make the 'rebase.missingCommitsCheck=ignore' test more focused
      pager: add a helper function to clear the last line in the terminal
      t5551: use 'test_i18ngrep' to check translated output
      rebase: fix garbled progress display with '-x'
      progress: use term_clear_line()
      Document that 'git -C ""' works and doesn't change directory
      ci: don't update Homebrew
      ci: disable Homebrew's auto cleanup
      ci/lib.sh: update a comment about installed P4 and Git-LFS versions
      travis-ci: build with GCC 4.8 as well

Simon Williams (1):
      git-p4: allow unshelving of branched files

Stephen Boyd (2):
      format-patch: inform user that patch-id generation is unstable
      format-patch: make --base patch-id output stable

Steven Roberts (1):
      gpg-interface: do not scan past the end of buffer

Taylor Blau (1):
      ref-filter.c: find disjoint pattern prefixes

Thomas Gummerer (16):
      stash: fix show referencing stash index
      apply: replace marc.info link with public-inbox
      apply: only pass required data to skip_tree_prefix
      apply: only pass required data to git_header_name
      apply: only pass required data to check_header_line
      apply: only pass required data to find_name_*
      apply: only pass required data to gitdiff_* functions
      apply: make parse_git_diff_header public
      range-diff: fix function parameter indentation
      range-diff: split lines manually
      range-diff: don't remove funcname from inner diff
      range-diff: suppress line count in outer diff
      range-diff: add section header instead of diff header
      range-diff: add filename to inner diff
      range-diff: add headers to the outer hunk header
      stash: fix handling removed files with --keep-index

Tigran Mkrtchyan (1):
      tag: add tag.gpgSign config option to force all tags be GPG-signed

Varun Naik (1):
      read-cache.c: do not die if mmap fails

Vishal Verma (1):
      merge: refuse --commit with --squash

Xin Li (1):
      clone: respect user supplied origin name when setting up partial clone

Ævar Arnfjörð Bjarmason (21):
      send-email: move the read_config() function above getopts
      send-email: rename the @bcclist variable for consistency
      send-email: do defaults -> config -> getopt in that order
      tests: add a special setup where prerequisites fail
      Makefile: remove the NO_R_TO_GCC_LINKER flag
      send-email: remove cargo-culted multi-patch pattern in tests
      send-email: fix broken transferEncoding tests
      send-email: document --no-[to|cc|bcc]
      hash-object doc: stop mentioning git-cvsimport
      send-email: fix regression in sendemail.identity parsing
      Revert "test-lib: whitelist GIT_TR2_* in the environment"
      config tests: simplify include cycle test
      env--helper: new undocumented builtin wrapping git_env_*()
      config.c: refactor die_bad_number() to not call gettext() early
      t6040 test: stop using global "script" variable
      tests: make GIT_TEST_GETTEXT_POISON a boolean
      tests README: re-flow a previously changed paragraph
      tests: replace test_tristate with "git env--helper"
      tests: make GIT_TEST_FAIL_PREREQS a boolean
      tests: mark two failing tests under FAIL_PREREQS
      clone: test for our behavior on odd objects/* content

Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Johannes Schindelin]

Hi,

On Mon, 29 Jul 2019, Junio C Hamano wrote:

> An early preview release Git v2.23.0-rc0 is now available for
> testing at the usual places.  It is comprised of 420 non-merge
> commits since v2.22.0, contributed by 62 people, 23 of which are
> new faces.
>
> The tarballs are found at:
>
>     https://www.kernel.org/pub/software/scm/git/testing/

And a corresponding Git for Windows v2.23.0-rc0 can be found here:

https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1

Please test!

One (slightly annoying) issue I found already is that a `git log` will
print out a blurb about `log.mailmap`, but most of the time, you cannot
see it because the actual output of `git log` is shown in the pager.

I plan on working around this by setting `log.mailmap = true` in Git for
Windows' system config.

Ciao,
Johannes

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jeff King]

On Wed, Jul 31, 2019 at 02:43:10PM +0200, Johannes Schindelin wrote:

> And a corresponding Git for Windows v2.23.0-rc0 can be found here:
> 
> https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1
> 
> Please test!
> 
> One (slightly annoying) issue I found already is that a `git log` will
> print out a blurb about `log.mailmap`, but most of the time, you cannot
> see it because the actual output of `git log` is shown in the pager.
> 
> I plan on working around this by setting `log.mailmap = true` in Git for
> Windows' system config.

I too was annoyed recently by that warning (I set the config to squelch
it, but I'm sure it will pop up again for me in some other context where
I don't have my usual config).

Setting log.mailmap=true in the distributed system seems to defeat the
purpose, though, doesn't it? The point is for users to see the warning
and adjust their expectations, but with your plan they would never see
it.

I think part of what my annoyance is responding to (and your willingness
to just squelch this for everybody) is that switching this particular
default isn't really that big a deal, that it requires annoying people
on every single "git log" invocation. Perhaps we would be better
squelching it entirely and just putting a mention in the release notes.

I know that having been burned by the dashed-form deprecation long ago,
Junio is hesitant to rely on release notes. But it really seems like
this is a pretty minor change, and the solution is worse than the
problem.

-Peff

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jonathan Nieder]

Jeff King wrote:

> I think part of what my annoyance is responding to (and your willingness
> to just squelch this for everybody) is that switching this particular
> default isn't really that big a deal, that it requires annoying people
> on every single "git log" invocation. Perhaps we would be better
> squelching it entirely and just putting a mention in the release notes.

Yes.

Although as Dscho mentions, it's particularly irritating because it is
not part of the paginated output.

I wonder if the ideal might not be to trigger it more selectively, when
the output actually changed due to a reflog entry.  I mean something
like

	commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)
	Merge: 18598e40e6 1eba6eb1c2
	Author: A U Thor <author@example.com> (see "git help mailmap")
	Date:   Tue Jul 30 15:05:41 2019 -0700

	    Merge branch 'jt/fetch-cdn-offload' into foo

The message

	warning: log.mailmap is not set; its implicit value will change in an
	upcoming release. To squelch this message and preserve current
	behaviour, set the log.mailmap configuration value to false.

	To squelch this message and adopt the new behaviour now, set the
	log.mailmap configuration value to true.

is *particularly* unactionable in the current state where we're not
rewriting authors.  I think we should bite the bullet and just flip
the default to "true", with the config as an escape hatch to allow
going back to the old behavior.

Is it too late in the release cycle to do that?  If not, we can do

-- >8 --
Subject: log: use mailmap by default in interactive use

In f0596ecc8de9 (log: add warning for unspecified log.mailmap setting,
2019-07-15), we prepared for a future where "git log" uses the mailmap
by default, using the following conditions:

 1. If log.mailmap or --[no-]use-mailmap is set explicitly explicitly,
    respect that.  Otherwise:

 2. If output is not going to a terminal or pager, we might be in a
    script.  Match historical behavior by not using the mailmap.
    Otherwise:

 3. If the output format was specified using --pretty, we might be in
    a script that produces output intended for copy/paste.  Match
    historical behavior by not using the mailmap.  Otherwise:

 4. This is an interactive use, where we will be able to change the
    default behavior.  Print a warning about the upcoming change
    but don't use the mailmap yet.

In practice, the case (4) turns out to be irritating.  It prints
before pager setup, so it just flashes on the screen.  It appears on
every "git log" invocation, even when the mailmap would not result in
the output changing.  The change is not meaningful to most people, and
the new default of --use-mailmap is likely to be preferable for all of
them.

Let's bite the bullet and jump straight to --use-mailmap in case (4).

While at it, add a new log.mailmap setting "auto" that can be used to
explicitly request the new automatic behavior (so that e.g. if
log.mailmap is set to "true" system-side, I can set it to "auto" in my
per-user configuration).

Reported-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
 Documentation/RelNotes/2.23.0.txt |  6 ++----
 Documentation/config/log.txt      |  4 +++-
 builtin/log.c                     | 23 ++++++-----------------
 t/t4203-mailmap.sh                | 20 ++++++++++++++++++++
 t/t7006-pager.sh                  |  2 --
 5 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
index 9896599b2f..b4765a5472 100644
--- a/Documentation/RelNotes/2.23.0.txt
+++ b/Documentation/RelNotes/2.23.0.txt
@@ -91,10 +91,8 @@ UI, Workflows & Features
    commit-graph files now, which allows the commit-graph files to be
    updated incrementally.
 
- * The "git log" command learns to issue a warning when log.mailmap
-   configuration is not set and --[no-]mailmap option is not used, to
-   prepare users for future versions of Git that uses the mailmap by
-   default.
+ * The "git log" command learned to use --mailmap by default when
+   used interactively without a --pretty format option.
 
  * "git range-diff" output has been tweaked for easier identification
    of which part of what file the patch shown is about.
diff --git a/Documentation/config/log.txt b/Documentation/config/log.txt
index 7798e10cb0..739ea298aa 100644
--- a/Documentation/config/log.txt
+++ b/Documentation/config/log.txt
@@ -41,4 +41,6 @@ log.showSignature::
 log.mailmap::
 	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 	linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
-	assume `--no-use-mailmap`. False by default.
+	assume `--no-use-mailmap`. The default is `auto`, which means
+	to use mailmap if the output is going to a terminal and no
+	`--pretty` format has been specified.
diff --git a/builtin/log.c b/builtin/log.c
index 1cf9e37736..bafce51d01 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
 		parse_date_format(default_date_mode, &rev->date_mode);
 }
 
-static char warn_unspecified_mailmap_msg[] =
-N_("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"
-   "See 'git help config' and search for 'log.mailmap' for further information.");
-
 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			 struct rev_info *rev, struct setup_revision_opt *opt)
 {
@@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	memset(&w, 0, sizeof(w));
 	userformat_find_requirements(NULL, &w);
 
-	if (mailmap < 0) {
-		if (session_is_interactive() && !rev->pretty_given)
-			warning("%s\n", _(warn_unspecified_mailmap_msg));
-
-		mailmap = 0;
-	}
+	if (mailmap < 0)
+		mailmap = session_is_interactive() && !rev->pretty_given;
 
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
@@ -477,7 +463,10 @@ static int git_log_config(const char *var, const char *value, void *cb)
 	if (skip_prefix(var, "color.decorate.", &slot_name))
 		return parse_decorate_color_config(var, slot_name, value);
 	if (!strcmp(var, "log.mailmap")) {
-		use_mailmap_config = git_config_bool(var, value);
+		if (value && !strcasecmp(value, "auto"))
+			use_mailmap_config = -1;
+		else
+			use_mailmap_config = git_config_bool(var, value);
 		return 0;
 	}
 	if (!strcmp(var, "log.showsignature")) {
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 43b1522ea2..e398bc803a 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -3,6 +3,7 @@
 test_description='.mailmap configurations'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
 
 fuzz_blame () {
 	sed "
@@ -442,6 +443,25 @@ test_expect_success 'Log output with log.mailmap' '
 	test_cmp expect actual
 '
 
+test_expect_success TTY 'Use mailmap by default when writing to terminal' '
+	test_terminal git log | grep Author >actual &&
+	test_cmp expect actual
+'
+
+test_expect_success TTY 'Config overrides terminal' '
+	cat >expect <<-\EOF &&
+	Author: CTO <cto@coompany.xx>
+	Author: claus <me@company.xx>
+	Author: santa <me@company.xx>
+	Author: nick2 <nick2@company.xx>
+	Author: nick2 <bugs@company.xx>
+	Author: nick1 <bugs@company.xx>
+	Author: A U Thor <author@example.com>
+	EOF
+	test_terminal git -c log.mailmap=False log | grep Author >actual &&
+	test_cmp expect actual
+'
+
 cat >expect <<\EOF
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Santa Claus <santa.claus@northpole.xx>
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 7976fa7bcc..00e09a375c 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'setup' '
-	: squelch advice messages during the transition &&
-	git config --global log.mailmap false &&
 	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
 	test_unconfig core.pager &&
 
-- 
2.22.0.770.g0f2c4a37fd

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Ariadne Conill]

Hello,

On Wed, Jul 31, 2019 at 7:21 PM Jonathan Nieder <jrnieder@gmail.com> wrote:
>
> Jeff King wrote:
>
> > I think part of what my annoyance is responding to (and your willingness
> > to just squelch this for everybody) is that switching this particular
> > default isn't really that big a deal, that it requires annoying people
> > on every single "git log" invocation. Perhaps we would be better
> > squelching it entirely and just putting a mention in the release notes.
>
> Yes.
>
> Although as Dscho mentions, it's particularly irritating because it is
> not part of the paginated output.
>
> I wonder if the ideal might not be to trigger it more selectively, when
> the output actually changed due to a reflog entry.  I mean something
> like
>
>         commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)
>         Merge: 18598e40e6 1eba6eb1c2
>         Author: A U Thor <author@example.com> (see "git help mailmap")
>         Date:   Tue Jul 30 15:05:41 2019 -0700
>
>             Merge branch 'jt/fetch-cdn-offload' into foo
>
> The message
>
>         warning: log.mailmap is not set; its implicit value will change in an
>         upcoming release. To squelch this message and preserve current
>         behaviour, set the log.mailmap configuration value to false.
>
>         To squelch this message and adopt the new behaviour now, set the
>         log.mailmap configuration value to true.
>
> is *particularly* unactionable in the current state where we're not
> rewriting authors.  I think we should bite the bullet and just flip
> the default to "true", with the config as an escape hatch to allow
> going back to the old behavior.

This is what I originally proposed, but it was suggested that we
should go through the typical cycle for changing default behaviour in
Git, e.g. issue a warning and then flip the default in a later release
cycle (my plan was to do so in the next cycle, in fact).

>
> Is it too late in the release cycle to do that?  If not, we can do
>
> -- >8 --
> Subject: log: use mailmap by default in interactive use
>
> In f0596ecc8de9 (log: add warning for unspecified log.mailmap setting,
> 2019-07-15), we prepared for a future where "git log" uses the mailmap
> by default, using the following conditions:
>
>  1. If log.mailmap or --[no-]use-mailmap is set explicitly explicitly,
>     respect that.  Otherwise:
>
>  2. If output is not going to a terminal or pager, we might be in a
>     script.  Match historical behavior by not using the mailmap.
>     Otherwise:

For what it's worth, personally, I believe that it is best to just
always use the mailmap (even in scripts), because most likely if you
care about the author line, you're probably caring about the *present*
identity of the author who made the commit, because you wish to ask
them a question.  However, I decided that it would be best to be
conservative with the behaviour, for now, just in case somebody was
dependent on the historical author lines.

>  3. If the output format was specified using --pretty, we might be in
>     a script that produces output intended for copy/paste.  Match
>     historical behavior by not using the mailmap.  Otherwise:

This one is definitely intentional, as the user specified exactly what
they wanted.  So, we give them what they want -- if they want the raw
author lines, they get that, if they want the mapped version, then
they get that, because they explicitly asked for one or the other.

>  4. This is an interactive use, where we will be able to change the
>     default behavior.  Print a warning about the upcoming change
>     but don't use the mailmap yet.
>
> In practice, the case (4) turns out to be irritating.  It prints
> before pager setup, so it just flashes on the screen.  It appears on
> every "git log" invocation, even when the mailmap would not result in
> the output changing.  The change is not meaningful to most people, and
> the new default of --use-mailmap is likely to be preferable for all of
> them.
>
> Let's bite the bullet and jump straight to --use-mailmap in case (4).

Yes, I agree, the warning is suboptimal when used with a pager, but we
can only write to stderr, since writing to stdout may break scripts.
So, given the request of having a transitional period, I felt this was
the best we could do without breaking anything.

> While at it, add a new log.mailmap setting "auto" that can be used to
> explicitly request the new automatic behavior (so that e.g. if
> log.mailmap is set to "true" system-side, I can set it to "auto" in my
> per-user configuration).

This sounds like a great compromise, but honestly we should just flip
the default.  I can't think of any situation where the non-mapped
author lines wouldn't be the more preferable default.  If you want the
raw ones explicitly, you can just ask for them, either with
`--no-use-mailmap` or with `log.mailmap=false`.

> Reported-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>

At any rate... I don't have any major objections with going this route
as it solves the problem for the typical use-case, so...

Acked-by: Ariadne Conill <ariadne@dereferenced.org>

Ariadne

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jeff King]

On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:

> Although as Dscho mentions, it's particularly irritating because it is
> not part of the paginated output.
> 
> I wonder if the ideal might not be to trigger it more selectively, when
> the output actually changed due to a reflog entry.  I mean something
> like
> 
> 	commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)
> 	Merge: 18598e40e6 1eba6eb1c2
> 	Author: A U Thor <author@example.com> (see "git help mailmap")
> 	Date:   Tue Jul 30 15:05:41 2019 -0700
> 
> 	    Merge branch 'jt/fetch-cdn-offload' into foo

I actually kind of like that, because it tells you exactly when it is
impacting things (not just that the mailmap was used, but that this
_particular_ name was mapped, which is going to be the most actionable
thing). But I do think the syntax above might end up breaking somebody
who's trying to parse it (people aren't supposed to be parsing log
output, but...).

Something like:

  Author: A U Thor <author@example.com>
  Original-Author: I M Mailmapped <orig@example.com>

gives even more information while leaving the "Author:" line untouched.
But in introducing a new line, it may also be breaking somebody.

I think all of these are riskier than just quietly engaging the mailmap.
That's syntactically identical, so no risk of parsing regressions That's
almost always going to be what people _actually_ want if there's a
mailmap in the repo. The only exception is if they're somehow trying to
do analysis on original versus mapped names. At which point they really
ought to be using a parseable format like --pretty=raw, or "%an <%ae>".

> is *particularly* unactionable in the current state where we're not
> rewriting authors.  I think we should bite the bullet and just flip
> the default to "true", with the config as an escape hatch to allow
> going back to the old behavior.
> 
> Is it too late in the release cycle to do that?  If not, we can do

IMHO no, it is not too late. This is a new feature in this release, and
we're at -rc0. The point of the rc period is to find problems in the new
code. So certainly I think it is not too late to change our minds about
this feature. I could see an argument that instead of changing it now,
we should revert for v2.23 and work on it with less urgency during the
next cycle. But personally I'd see what a day or two of discussion turns
up; if everybody agrees on the path forward and the implementation isn't
complicated, it may be easiest to just proceed now.

> -- >8 --
> Subject: log: use mailmap by default in interactive use

This seems OK to me, though I kind of wonder if anybody really wants
"auto". Unlike log.decorate, which changes the syntax, there is no real
reason to avoid mailmap when somebody else is parsing the output. And I
could imagine it is especially confusing if:

  git log --author=whoever

and

  git log | grep whoever | wc -l

do not agree.

-Peff

Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Bryan Turner]

On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin
<Johannes.Schindelin@gmx.de> wrote:
>
> Hi,
>
> On Mon, 29 Jul 2019, Junio C Hamano wrote:
>
> > An early preview release Git v2.23.0-rc0 is now available for
> > testing at the usual places.  It is comprised of 420 non-merge
> > commits since v2.22.0, contributed by 62 people, 23 of which are
> > new faces.
> >
> > The tarballs are found at:
> >
> >     https://www.kernel.org/pub/software/scm/git/testing/
>
> And a corresponding Git for Windows v2.23.0-rc0 can be found here:
>
> https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1
>
> Please test!


I've run the full test suite for Bitbucket Server against 2.23.0-rc0
on Linux, macOS and Windows. No test failures to report.

Thanks again for these early release candidates! They're a great
opportunity to test new releases in advance.

Best regards,
Bryan Turner

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jonathan Nieder]

Jeff King wrote:

> This seems OK to me, though I kind of wonder if anybody really wants
> "auto".

Sure.  It's just the usual way of handling the lack of support for an
"unset" directive in git's config syntax (for example, if a script
author wants to test the default behavior).

Thanks,
Jonathan

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Ariadne Conill]

Hello,

On Wed, Jul 31, 2019 at 8:00 PM Jeff King <peff@peff.net> wrote:
>
> On Wed, Jul 31, 2019 at 05:21:25PM -0700, Jonathan Nieder wrote:
>
> > Although as Dscho mentions, it's particularly irritating because it is
> > not part of the paginated output.
> >
> > I wonder if the ideal might not be to trigger it more selectively, when
> > the output actually changed due to a reflog entry.  I mean something
> > like
> >
> >       commit 393a9dd0f9762c69f753a8fa0bc89c203c6b4e9e (HEAD, origin/foo, other/pu)
> >       Merge: 18598e40e6 1eba6eb1c2
> >       Author: A U Thor <author@example.com> (see "git help mailmap")
> >       Date:   Tue Jul 30 15:05:41 2019 -0700
> >
> >           Merge branch 'jt/fetch-cdn-offload' into foo
>
> I actually kind of like that, because it tells you exactly when it is
> impacting things (not just that the mailmap was used, but that this
> _particular_ name was mapped, which is going to be the most actionable
> thing). But I do think the syntax above might end up breaking somebody
> who's trying to parse it (people aren't supposed to be parsing log
> output, but...).
>
> Something like:
>
>   Author: A U Thor <author@example.com>
>   Original-Author: I M Mailmapped <orig@example.com>
>
> gives even more information while leaving the "Author:" line untouched.
> But in introducing a new line, it may also be breaking somebody.

It also makes this entire exercise completely moot because not only
does it deadname the contributor, it discloses that it is deadnaming
the contributor while also telling you who they are now, which is even
worse than the current behaviour.  The purpose of this exercise is to
ensure that users have the *current* contact information of the
contributor by default, including their current name and e-mail.  My
entire goal behind transitioning this config default is to ensure that
git respects *present* identity information by default, while giving
access to the raw identity data in cases where it makes sense to do so
(such as historical research or whatever).  I don't really wish for
git to remind me of my previous identity while browsing through
historical git logs.  I also don't think most people care about the
previous identity data of contributors -- in most cases, if you're
looking up a commit's author, you're doing so because you intend to
ask them a question about the commit, and so, having the most current
identity data available is what actually makes sense.

> I think all of these are riskier than just quietly engaging the mailmap.
> That's syntactically identical, so no risk of parsing regressions That's
> almost always going to be what people _actually_ want if there's a
> mailmap in the repo. The only exception is if they're somehow trying to
> do analysis on original versus mapped names. At which point they really
> ought to be using a parseable format like --pretty=raw, or "%an <%ae>".

Precisely, which is why I think we should just flip the default.
However, as previously mentioned, it was requested to do a formal
transition for the config setting, just to be absolutely sure that
people are aware the default was going to flip.

> > is *particularly* unactionable in the current state where we're not
> > rewriting authors.  I think we should bite the bullet and just flip
> > the default to "true", with the config as an escape hatch to allow
> > going back to the old behavior.
> >
> > Is it too late in the release cycle to do that?  If not, we can do
>
> IMHO no, it is not too late. This is a new feature in this release, and
> we're at -rc0. The point of the rc period is to find problems in the new
> code. So certainly I think it is not too late to change our minds about
> this feature. I could see an argument that instead of changing it now,
> we should revert for v2.23 and work on it with less urgency during the
> next cycle. But personally I'd see what a day or two of discussion turns
> up; if everybody agrees on the path forward and the implementation isn't
> complicated, it may be easiest to just proceed now.

Honestly, the current default is arguably an unintentional bug.  As
you note, it's a default that makes no sense and flipping it will give
people what they *actually* want.  Accordingly, I have thought, and
still think, that we're best off just flipping the default and saying
we fixed a bug, because the current behaviour is certainly perceived
by many people as being a bug -- in fact, when I first looked into
this, I thought it *was* a bug, only to find out that the default was
the way it was.  I'm certainly not alone in perceiving the current
behaviour as a bug, especially since `git shortlog` respects mailmap
by default and `git log` doesn't.

>
> > -- >8 --
> > Subject: log: use mailmap by default in interactive use
>
> This seems OK to me, though I kind of wonder if anybody really wants
> "auto". Unlike log.decorate, which changes the syntax, there is no real
> reason to avoid mailmap when somebody else is parsing the output. And I
> could imagine it is especially confusing if:
>
>   git log --author=whoever
>
> and
>
>   git log | grep whoever | wc -l
>
> do not agree.
>
> -Peff

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jeff King]

On Wed, Jul 31, 2019 at 08:38:14PM -0500, Ariadne Conill wrote:

> > Something like:
> >
> >   Author: A U Thor <author@example.com>
> >   Original-Author: I M Mailmapped <orig@example.com>
> >
> > gives even more information while leaving the "Author:" line untouched.
> > But in introducing a new line, it may also be breaking somebody.
> 
> It also makes this entire exercise completely moot because not only
> does it deadname the contributor, it discloses that it is deadnaming
> the contributor while also telling you who they are now, which is even
> worse than the current behaviour.  The purpose of this exercise is to
> ensure that users have the *current* contact information of the
> contributor by default, including their current name and e-mail.  My
> entire goal behind transitioning this config default is to ensure that
> git respects *present* identity information by default, while giving
> access to the raw identity data in cases where it makes sense to do so
> (such as historical research or whatever).  I don't really wish for
> git to remind me of my previous identity while browsing through
> historical git logs.  I also don't think most people care about the
> previous identity data of contributors -- in most cases, if you're
> looking up a commit's author, you're doing so because you intend to
> ask them a question about the commit, and so, having the most current
> identity data available is what actually makes sense.

Fair enough. My thinking was just that it would make it clear to
somebody who wasn't expecting the mailmap to be used what was going on:
they would have seen "orig" in the old output, but now they are seeing
"author". But I agree that most people wouldn't even _care_, and the
orig name is just garbage in most cases.

I had been thinking it would be a temporary measure during the
transition period, but it probably isn't even worth the hassle and
confusion it would cause during that period.

By the way, we've been talking mostly about output in this thread. One
thing that did catch me a little by surprise is that "--author", etc,
will now use the mailmap by default, too. Which I think makes perfect
sense, but when looking for my own mailmapped entries to run some
examples on, I was surprised at first that "git log
--author=peff@github.com" didn't find anything.

But aside from experimenting with this mailmap feature, I cannot think
of a single time in the last decade I would have cared about that
distinction (and in fact, most of the time I would be searching for my
own commits by my mailmapped address, and would have preferred they be
found in that group).

-Peff

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

> This seems OK to me, though I kind of wonder if anybody really wants
> "auto". Unlike log.decorate, which changes the syntax, there is no real
> reason to avoid mailmap when somebody else is parsing the output. And I
> could imagine it is especially confusing if:
>
>   git log --author=whoever
>
> and
>
>   git log | grep whoever | wc -l
>
> do not agree.

I personally do not think it is too late to change for the upcoming
release, either.

But 'auto' that changes the displayed name depending on the output
being or not being a terminal makes little sense, I would think, for
the above reason.

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Ariadne Conill]

Hello,

On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano <gitster@pobox.com> wrote:
>
> Jeff King <peff@peff.net> writes:
>
> > This seems OK to me, though I kind of wonder if anybody really wants
> > "auto". Unlike log.decorate, which changes the syntax, there is no real
> > reason to avoid mailmap when somebody else is parsing the output. And I
> > could imagine it is especially confusing if:
> >
> >   git log --author=whoever
> >
> > and
> >
> >   git log | grep whoever | wc -l
> >
> > do not agree.
>
> I personally do not think it is too late to change for the upcoming
> release, either.
>
> But 'auto' that changes the displayed name depending on the output
> being or not being a terminal makes little sense, I would think, for
> the above reason.
>

I think if the warning is annoying people, then we should just change
the default and document it in the release notes.  Ultimately, I think
that this is behaviour that most see as a bug (especially when you
consider that `git shortlog` and `git blame` default to using mailmap
already), so simply describing it as a bugfix is arguably sufficient.

Ariadne

[PATCH] RelNotes/2.23.0: fix a few typos and other minor issues

[Martin Ågren]

Fix the spelling of the new "--no-show-forced-updates" option that "git
fetch/pull" learned. Similarly, spell "--function-context" correctly and
fix a few typos, grammos and minor mistakes.

One of these is also in 2.22.1.txt, so fix it there too.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
---
 Documentation/RelNotes/2.22.1.txt |  2 +-
 Documentation/RelNotes/2.23.0.txt | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
index 78b2c5ea8a..76dd8fb578 100644
--- a/Documentation/RelNotes/2.22.1.txt
+++ b/Documentation/RelNotes/2.22.1.txt
@@ -94,7 +94,7 @@ Fixes since v2.22
 
  * The configuration variable rebase.rescheduleFailedExec should be
    effective only while running an interactive rebase and should not
-   affect anything when running an non-interactive one, which was not
+   affect anything when running a non-interactive one, which was not
    the case.  This has been corrected.
 
  * "git submodule foreach" did not protect command line options passed
diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
index 19e894a44e..e1b1ce5680 100644
--- a/Documentation/RelNotes/2.23.0.txt
+++ b/Documentation/RelNotes/2.23.0.txt
@@ -52,7 +52,7 @@ UI, Workflows & Features
 
  * "git fetch" and "git pull" reports when a fetch results in
    non-fast-forward updates to let the user notice unusual situation.
-   The commands learned "--no-shown-forced-updates" option to disable
+   The commands learned "--no-show-forced-updates" option to disable
    this safety feature.
 
  * Two new commands "git switch" and "git restore" are introduced to
@@ -68,7 +68,7 @@ UI, Workflows & Features
  * The conditional inclusion mechanism learned to base the choice on
    the branch the HEAD currently is on.
 
- * "git rev-list --objects" learned with "--no-object-names" option to
+ * "git rev-list --objects" learned the "--no-object-names" option to
    squelch the path to the object that is used as a grouping hint for
    pack-objects.
 
@@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
    no longer be used.
 
  * Developer support to emulate unsatisfied prerequisites in tests to
-   ensure that the remainer of the tests still succeeds when tests
+   ensure that the remainder of the tests still succeeds when tests
    with prerequisites are skipped.
 
  * "git update-server-info" learned not to rewrite the file with the
@@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.
  * Prepare use of reachability index in topological walker that works
    on a range (A..B).
 
- * A new tutorial targetting specifically aspiring git-core
+ * A new tutorial targeting specifically aspiring git-core
    developers has been added.
 
  * Auto-detect how to tell HP-UX aCC where to use dynamically linked
@@ -181,7 +181,7 @@ Fixes since v2.22
    the same repository was corrupt, which has been corrected.
 
  * The ownership rule for the file descriptor to fast-import remote
-   backend was mixed up, leading to unrelated file descriptor getting
+   backend was mixed up, leading to an unrelated file descriptor getting
    closed, which has been fixed.
 
  * A "merge -c" instruction during "git rebase --rebase-merges" should
@@ -306,7 +306,7 @@ Fixes since v2.22
 
  * The configuration variable rebase.rescheduleFailedExec should be
    effective only while running an interactive rebase and should not
-   affect anything when running an non-interactive one, which was not
+   affect anything when running a non-interactive one, which was not
    the case.  This has been corrected.
 
  * The "git clone" documentation refers to command line options in its
@@ -339,7 +339,7 @@ Fixes since v2.22
    having to consult the other end, which has been corrected.
 
  * The internal diff machinery can be made to read out of bounds while
-   looking for --funcion-context line in a corner case, which has been
+   looking for --function-context line in a corner case, which has been
    corrected.
    (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).
 
-- 
2.23.0.rc0

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> writes:

> Although as Dscho mentions, it's particularly irritating because it is
> not part of the paginated output.
> ...
> Let's bite the bullet and jump straight to --use-mailmap in case (4).
>
> While at it, add a new log.mailmap setting "auto" that can be used to
> explicitly request the new automatic behavior (so that e.g. if
> log.mailmap is set to "true" system-side, I can set it to "auto" in my
> per-user configuration).

While I think "revert to hardcoded default" may be a good idea, I do
not think the hardcoded default you implemented that changes the
behaviour based on the output destination makes much sense.  If I
want to eradicate junkio@cox.net from my paged/interactive output, I
want to eradicate it also in the output piped to the script I use
for authorship stats.  

I suspect that you may have misread the "is interactive" bit in the
original; that was used only to decide if we are going to warn.

Anyway, how about this much simplified version?

-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Aug 2019 08:32:44 -0700
Subject: [PATCH] log: flip the --mailmap default unconditionally

It turns out that being cautious to warn against upcoming default
change was an unpopular behaviour, and such a care can easily be
defeated by distro packagers to render it ineffective anyway.

Just flip the default, with only a mention in the release notes.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 Documentation/RelNotes/2.23.0.txt |  8 +++-----
 builtin/log.c                     | 16 +---------------
 t/t7006-pager.sh                  |  2 --
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
index 19e894a44e..6ef8f21b56 100644
--- a/Documentation/RelNotes/2.23.0.txt
+++ b/Documentation/RelNotes/2.23.0.txt
@@ -10,6 +10,9 @@ Backward compatibility note
    prerequisite patches in an unstable way, which has been updated to
    compute in a way that is compatible with "git patch-id --stable".
 
+ * The "git log" command by default behaves as if the --mailmap option
+   was given.
+
 
 UI, Workflows & Features
 
@@ -91,11 +94,6 @@ UI, Workflows & Features
    commit-graph files now, which allows the commit-graph files to be
    updated incrementally.
 
- * The "git log" command learns to issue a warning when log.mailmap
-   configuration is not set and --[no-]mailmap option is not used, to
-   prepare users for future versions of Git that uses the mailmap by
-   default.
-
  * "git range-diff" output has been tweaked for easier identification
    of which part of what file the patch shown is about.
 
diff --git a/builtin/log.c b/builtin/log.c
index 1cf9e37736..40b4cbf57d 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
 		parse_date_format(default_date_mode, &rev->date_mode);
 }
 
-static char warn_unspecified_mailmap_msg[] =
-N_("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"
-   "See 'git help config' and search for 'log.mailmap' for further information.");
-
 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			 struct rev_info *rev, struct setup_revision_opt *opt)
 {
@@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	memset(&w, 0, sizeof(w));
 	userformat_find_requirements(NULL, &w);
 
-	if (mailmap < 0) {
-		if (session_is_interactive() && !rev->pretty_given)
-			warning("%s\n", _(warn_unspecified_mailmap_msg));
-
+	if (mailmap < 0)
 		mailmap = 0;
-	}
 
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 7976fa7bcc..00e09a375c 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'
 . "$TEST_DIRECTORY"/lib-terminal.sh
 
 test_expect_success 'setup' '
-	: squelch advice messages during the transition &&
-	git config --global log.mailmap false &&
 	sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
 	test_unconfig core.pager &&
 
-- 
2.23.0-rc0-144-gce799e40b3

Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues

[Junio C Hamano]

Martin Ågren <martin.agren@gmail.com> writes:

> Fix the spelling of the new "--no-show-forced-updates" option that "git
> fetch/pull" learned. Similarly, spell "--function-context" correctly and
> fix a few typos, grammos and minor mistakes.
>
> One of these is also in 2.22.1.txt, so fix it there too.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>

Thanks.

> ---
>  Documentation/RelNotes/2.22.1.txt |  2 +-
>  Documentation/RelNotes/2.23.0.txt | 14 +++++++-------
>  2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
> index 78b2c5ea8a..76dd8fb578 100644
> --- a/Documentation/RelNotes/2.22.1.txt
> +++ b/Documentation/RelNotes/2.22.1.txt
> @@ -94,7 +94,7 @@ Fixes since v2.22
>  
>   * The configuration variable rebase.rescheduleFailedExec should be
>     effective only while running an interactive rebase and should not
> -   affect anything when running an non-interactive one, which was not
> +   affect anything when running a non-interactive one, which was not
>     the case.  This has been corrected.
>  
>   * "git submodule foreach" did not protect command line options passed
> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
> index 19e894a44e..e1b1ce5680 100644
> --- a/Documentation/RelNotes/2.23.0.txt
> +++ b/Documentation/RelNotes/2.23.0.txt
> @@ -52,7 +52,7 @@ UI, Workflows & Features
>  
>   * "git fetch" and "git pull" reports when a fetch results in
>     non-fast-forward updates to let the user notice unusual situation.
> -   The commands learned "--no-shown-forced-updates" option to disable
> +   The commands learned "--no-show-forced-updates" option to disable
>     this safety feature.
>  
>   * Two new commands "git switch" and "git restore" are introduced to
> @@ -68,7 +68,7 @@ UI, Workflows & Features
>   * The conditional inclusion mechanism learned to base the choice on
>     the branch the HEAD currently is on.
>  
> - * "git rev-list --objects" learned with "--no-object-names" option to
> + * "git rev-list --objects" learned the "--no-object-names" option to
>     squelch the path to the object that is used as a grouping hint for
>     pack-objects.
>  
> @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
>     no longer be used.
>  
>   * Developer support to emulate unsatisfied prerequisites in tests to
> -   ensure that the remainer of the tests still succeeds when tests
> +   ensure that the remainder of the tests still succeeds when tests
>     with prerequisites are skipped.
>  
>   * "git update-server-info" learned not to rewrite the file with the
> @@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.
>   * Prepare use of reachability index in topological walker that works
>     on a range (A..B).
>  
> - * A new tutorial targetting specifically aspiring git-core
> + * A new tutorial targeting specifically aspiring git-core
>     developers has been added.
>  
>   * Auto-detect how to tell HP-UX aCC where to use dynamically linked
> @@ -181,7 +181,7 @@ Fixes since v2.22
>     the same repository was corrupt, which has been corrected.
>  
>   * The ownership rule for the file descriptor to fast-import remote
> -   backend was mixed up, leading to unrelated file descriptor getting
> +   backend was mixed up, leading to an unrelated file descriptor getting
>     closed, which has been fixed.
>  
>   * A "merge -c" instruction during "git rebase --rebase-merges" should
> @@ -306,7 +306,7 @@ Fixes since v2.22
>  
>   * The configuration variable rebase.rescheduleFailedExec should be
>     effective only while running an interactive rebase and should not
> -   affect anything when running an non-interactive one, which was not
> +   affect anything when running a non-interactive one, which was not
>     the case.  This has been corrected.
>  
>   * The "git clone" documentation refers to command line options in its
> @@ -339,7 +339,7 @@ Fixes since v2.22
>     having to consult the other end, which has been corrected.
>  
>   * The internal diff machinery can be made to read out of bounds while
> -   looking for --funcion-context line in a corner case, which has been
> +   looking for --function-context line in a corner case, which has been
>     corrected.
>     (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).

Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues

[Junio C Hamano]

Martin Ågren <martin.agren@gmail.com> writes:

> Fix the spelling of the new "--no-show-forced-updates" option that "git
> fetch/pull" learned. Similarly, spell "--function-context" correctly and
> fix a few typos, grammos and minor mistakes.
>
> One of these is also in 2.22.1.txt, so fix it there too.
>
> Signed-off-by: Martin Ågren <martin.agren@gmail.com>

Thanks, but it would have been better for this to be in two
patches.  I'll split them up.


> ---
>  Documentation/RelNotes/2.22.1.txt |  2 +-
>  Documentation/RelNotes/2.23.0.txt | 14 +++++++-------
>  2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.22.1.txt b/Documentation/RelNotes/2.22.1.txt
> index 78b2c5ea8a..76dd8fb578 100644
> --- a/Documentation/RelNotes/2.22.1.txt
> +++ b/Documentation/RelNotes/2.22.1.txt
> @@ -94,7 +94,7 @@ Fixes since v2.22
>  
>   * The configuration variable rebase.rescheduleFailedExec should be
>     effective only while running an interactive rebase and should not
> -   affect anything when running an non-interactive one, which was not
> +   affect anything when running a non-interactive one, which was not
>     the case.  This has been corrected.
>  
>   * "git submodule foreach" did not protect command line options passed
> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
> index 19e894a44e..e1b1ce5680 100644
> --- a/Documentation/RelNotes/2.23.0.txt
> +++ b/Documentation/RelNotes/2.23.0.txt
> @@ -52,7 +52,7 @@ UI, Workflows & Features
>  
>   * "git fetch" and "git pull" reports when a fetch results in
>     non-fast-forward updates to let the user notice unusual situation.
> -   The commands learned "--no-shown-forced-updates" option to disable
> +   The commands learned "--no-show-forced-updates" option to disable
>     this safety feature.
>  
>   * Two new commands "git switch" and "git restore" are introduced to
> @@ -68,7 +68,7 @@ UI, Workflows & Features
>   * The conditional inclusion mechanism learned to base the choice on
>     the branch the HEAD currently is on.
>  
> - * "git rev-list --objects" learned with "--no-object-names" option to
> + * "git rev-list --objects" learned the "--no-object-names" option to
>     squelch the path to the object that is used as a grouping hint for
>     pack-objects.
>  
> @@ -106,7 +106,7 @@ Performance, Internal Implementation, Development Support etc.
>     no longer be used.
>  
>   * Developer support to emulate unsatisfied prerequisites in tests to
> -   ensure that the remainer of the tests still succeeds when tests
> +   ensure that the remainder of the tests still succeeds when tests
>     with prerequisites are skipped.
>  
>   * "git update-server-info" learned not to rewrite the file with the
> @@ -121,7 +121,7 @@ Performance, Internal Implementation, Development Support etc.
>   * Prepare use of reachability index in topological walker that works
>     on a range (A..B).
>  
> - * A new tutorial targetting specifically aspiring git-core
> + * A new tutorial targeting specifically aspiring git-core
>     developers has been added.
>  
>   * Auto-detect how to tell HP-UX aCC where to use dynamically linked
> @@ -181,7 +181,7 @@ Fixes since v2.22
>     the same repository was corrupt, which has been corrected.
>  
>   * The ownership rule for the file descriptor to fast-import remote
> -   backend was mixed up, leading to unrelated file descriptor getting
> +   backend was mixed up, leading to an unrelated file descriptor getting
>     closed, which has been fixed.
>  
>   * A "merge -c" instruction during "git rebase --rebase-merges" should
> @@ -306,7 +306,7 @@ Fixes since v2.22
>  
>   * The configuration variable rebase.rescheduleFailedExec should be
>     effective only while running an interactive rebase and should not
> -   affect anything when running an non-interactive one, which was not
> +   affect anything when running a non-interactive one, which was not
>     the case.  This has been corrected.
>  
>   * The "git clone" documentation refers to command line options in its
> @@ -339,7 +339,7 @@ Fixes since v2.22
>     having to consult the other end, which has been corrected.
>  
>   * The internal diff machinery can be made to read out of bounds while
> -   looking for --funcion-context line in a corner case, which has been
> +   looking for --function-context line in a corner case, which has been
>     corrected.
>     (merge b777f3fd61 jk/xdiff-clamp-funcname-context-index later to maint).

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Ariadne Conill]

Hello,

On Thu, Aug 1, 2019 at 10:46 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> Jonathan Nieder <jrnieder@gmail.com> writes:
>
> > Although as Dscho mentions, it's particularly irritating because it is
> > not part of the paginated output.
> > ...
> > Let's bite the bullet and jump straight to --use-mailmap in case (4).
> >
> > While at it, add a new log.mailmap setting "auto" that can be used to
> > explicitly request the new automatic behavior (so that e.g. if
> > log.mailmap is set to "true" system-side, I can set it to "auto" in my
> > per-user configuration).
>
> While I think "revert to hardcoded default" may be a good idea, I do
> not think the hardcoded default you implemented that changes the
> behaviour based on the output destination makes much sense.  If I
> want to eradicate junkio@cox.net from my paged/interactive output, I
> want to eradicate it also in the output piped to the script I use
> for authorship stats.
>
> I suspect that you may have misread the "is interactive" bit in the
> original; that was used only to decide if we are going to warn.
>
> Anyway, how about this much simplified version?

It looks good to me.

Acked-by: Ariadne Conill <ariadne@dereferenced.org>

>
> -- >8 --
> From: Junio C Hamano <gitster@pobox.com>
> Date: Thu, 1 Aug 2019 08:32:44 -0700
> Subject: [PATCH] log: flip the --mailmap default unconditionally
>
> It turns out that being cautious to warn against upcoming default
> change was an unpopular behaviour, and such a care can easily be
> defeated by distro packagers to render it ineffective anyway.
>
> Just flip the default, with only a mention in the release notes.
>
> Signed-off-by: Junio C Hamano <gitster@pobox.com>
> ---
>  Documentation/RelNotes/2.23.0.txt |  8 +++-----
>  builtin/log.c                     | 16 +---------------
>  t/t7006-pager.sh                  |  2 --
>  3 files changed, 4 insertions(+), 22 deletions(-)
>
> diff --git a/Documentation/RelNotes/2.23.0.txt b/Documentation/RelNotes/2.23.0.txt
> index 19e894a44e..6ef8f21b56 100644
> --- a/Documentation/RelNotes/2.23.0.txt
> +++ b/Documentation/RelNotes/2.23.0.txt
> @@ -10,6 +10,9 @@ Backward compatibility note
>     prerequisite patches in an unstable way, which has been updated to
>     compute in a way that is compatible with "git patch-id --stable".
>
> + * The "git log" command by default behaves as if the --mailmap option
> +   was given.
> +
>
>  UI, Workflows & Features
>
> @@ -91,11 +94,6 @@ UI, Workflows & Features
>     commit-graph files now, which allows the commit-graph files to be
>     updated incrementally.
>
> - * The "git log" command learns to issue a warning when log.mailmap
> -   configuration is not set and --[no-]mailmap option is not used, to
> -   prepare users for future versions of Git that uses the mailmap by
> -   default.
> -
>   * "git range-diff" output has been tweaked for easier identification
>     of which part of what file the patch shown is about.
>
> diff --git a/builtin/log.c b/builtin/log.c
> index 1cf9e37736..40b4cbf57d 100644
> --- a/builtin/log.c
> +++ b/builtin/log.c
> @@ -156,16 +156,6 @@ static void cmd_log_init_defaults(struct rev_info *rev)
>                 parse_date_format(default_date_mode, &rev->date_mode);
>  }
>
> -static char warn_unspecified_mailmap_msg[] =
> -N_("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"
> -   "See 'git help config' and search for 'log.mailmap' for further information.");
> -
>  static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>                          struct rev_info *rev, struct setup_revision_opt *opt)
>  {
> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>         memset(&w, 0, sizeof(w));
>         userformat_find_requirements(NULL, &w);
>
> -       if (mailmap < 0) {
> -               if (session_is_interactive() && !rev->pretty_given)
> -                       warning("%s\n", _(warn_unspecified_mailmap_msg));
> -
> +       if (mailmap < 0)
>                 mailmap = 0;
> -       }
>
>         if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
>                 rev->show_notes = 1;
> diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
> index 7976fa7bcc..00e09a375c 100755
> --- a/t/t7006-pager.sh
> +++ b/t/t7006-pager.sh
> @@ -7,8 +7,6 @@ test_description='Test automatic use of a pager.'
>  . "$TEST_DIRECTORY"/lib-terminal.sh
>
>  test_expect_success 'setup' '
> -       : squelch advice messages during the transition &&
> -       git config --global log.mailmap false &&
>         sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
>         test_unconfig core.pager &&
>
> --
> 2.23.0-rc0-144-gce799e40b3
>
>
>

Re: [PATCH] RelNotes/2.23.0: fix a few typos and other minor issues

[Martin Ågren]

On Thu, 1 Aug 2019 at 17:57, Junio C Hamano <gitster@pobox.com> wrote:
>
> Martin Ågren <martin.agren@gmail.com> writes:
>
> > Fix the spelling of the new "--no-show-forced-updates" option that "git
> > fetch/pull" learned. Similarly, spell "--function-context" correctly and
> > fix a few typos, grammos and minor mistakes.
> >
> > One of these is also in 2.22.1.txt, so fix it there too.
>
> Thanks, but it would have been better for this to be in two
> patches.  I'll split them up.

Oh, right, I suppose you'd *much* prefer a patch that applies on maint
for the 2.22.1-fix. It didn't occur to me. Sorry about that. Thanks for
adjusting on your end.

Martin

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jeff King]

On Thu, Aug 01, 2019 at 08:45:54AM -0700, Junio C Hamano wrote:

> While I think "revert to hardcoded default" may be a good idea, I do
> not think the hardcoded default you implemented that changes the
> behaviour based on the output destination makes much sense.  If I
> want to eradicate junkio@cox.net from my paged/interactive output, I
> want to eradicate it also in the output piped to the script I use
> for authorship stats.  
> 
> I suspect that you may have misread the "is interactive" bit in the
> original; that was used only to decide if we are going to warn.

Yeah, I wondered about the same misreading when I read the response in:

  https://public-inbox.org/git/20190801011448.GB176307@google.com/

> Anyway, how about this much simplified version?

Yes, this is what I was thinking of in my earlier responses, but...

> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>  	memset(&w, 0, sizeof(w));
>  	userformat_find_requirements(NULL, &w);
>  
> -	if (mailmap < 0) {
> -		if (session_is_interactive() && !rev->pretty_given)
> -			warning("%s\n", _(warn_unspecified_mailmap_msg));
> -
> +	if (mailmap < 0)
>  		mailmap = 0;
> -	}

This should be "mailmap = 1" to match the commit message, no? (Which
also implies we may want a new test).

I'd also be OK with leaving it at "0" for now, making a note of the
upcoming change in the release notes, and flipping it _next_ time. But
IMHO we don't need to be that conservative (and I share your pessimism
that enough people actually read the release notes to merit that kind of
advance notice).

-Peff

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Johannes Schindelin]

Hi,

On Wed, 31 Jul 2019, Ariadne Conill wrote:

> Hello,
>
> On Wed, Jul 31, 2019 at 10:21 PM Junio C Hamano <gitster@pobox.com> wrote:
> >
> > Jeff King <peff@peff.net> writes:
> >
> > > This seems OK to me, though I kind of wonder if anybody really wants
> > > "auto". Unlike log.decorate, which changes the syntax, there is no real
> > > reason to avoid mailmap when somebody else is parsing the output. And I
> > > could imagine it is especially confusing if:
> > >
> > >   git log --author=whoever
> > >
> > > and
> > >
> > >   git log | grep whoever | wc -l
> > >
> > > do not agree.
> >
> > I personally do not think it is too late to change for the upcoming
> > release, either.
> >
> > But 'auto' that changes the displayed name depending on the output
> > being or not being a terminal makes little sense, I would think, for
> > the above reason.
> >
>
> I think if the warning is annoying people, then we should just change
> the default and document it in the release notes.  Ultimately, I think
> that this is behaviour that most see as a bug (especially when you
> consider that `git shortlog` and `git blame` default to using mailmap
> already), so simply describing it as a bugfix is arguably sufficient.

I also agree!

And it makes me happy not only because I am no longer annoyed by that
warning that flickers before the pager kicks in, but even happier
because I know people who used to be known by another name that they
really do not care about anymore.

Thanks,
Dscho

Re: [git-for-windows] Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Johannes Schindelin]

Hi Bryan,

On Wed, 31 Jul 2019, Bryan Turner wrote:

> On Wed, Jul 31, 2019 at 5:43 AM Johannes Schindelin
> <Johannes.Schindelin@gmx.de> wrote:
> >
> > Hi,
> >
> > On Mon, 29 Jul 2019, Junio C Hamano wrote:
> >
> > > An early preview release Git v2.23.0-rc0 is now available for
> > > testing at the usual places.  It is comprised of 420 non-merge
> > > commits since v2.22.0, contributed by 62 people, 23 of which are
> > > new faces.
> > >
> > > The tarballs are found at:
> > >
> > >     https://www.kernel.org/pub/software/scm/git/testing/
> >
> > And a corresponding Git for Windows v2.23.0-rc0 can be found here:
> >
> > https://github.com/git-for-windows/git/releases/tag/v2.23.0-rc0.windows.1
> >
> > Please test!
>
>
> I've run the full test suite for Bitbucket Server against 2.23.0-rc0
> on Linux, macOS and Windows. No test failures to report.
>
> Thanks again for these early release candidates! They're a great
> opportunity to test new releases in advance.

Thank you _so_ much for diligently testing all of them ;-)

Ciao,
Dscho

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

Jeff King <peff@peff.net> writes:

>> +	if (mailmap < 0)
>>  		mailmap = 0;
>> -	}
>
> This should be "mailmap = 1" to match the commit message, no? (Which
> also implies we may want a new test).

Gaa, of course.

> I'd also be OK with leaving it at "0" for now, making a note of the
> upcoming change in the release notes, and flipping it _next_ time. But
> IMHO we don't need to be that conservative (and I share your pessimism
> that enough people actually read the release notes to merit that kind of
> advance notice).

I'd actually think s/need to be/get any benefit from being/; it
would be wasted effort to be extra careful, and any way we cut it,
there will always be people who complain.

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> Jeff King <peff@peff.net> writes:
>
>>> +	if (mailmap < 0)
>>>  		mailmap = 0;
>>> -	}
>>
>> This should be "mailmap = 1" to match the commit message, no? (Which
>> also implies we may want a new test).
>
> Gaa, of course.

-- >8 --
From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Aug 2019 14:48:34 -0700
Subject: [PATCH] log: really flip the --mailmap default

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 builtin/log.c      | 2 +-
 t/t4203-mailmap.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/builtin/log.c b/builtin/log.c
index 40b4cbf57d..02fa179077 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -205,7 +205,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	userformat_find_requirements(NULL, &w);
 
 	if (mailmap < 0)
-		mailmap = 0;
+		mailmap = 1;
 
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh
index 43b1522ea2..ede0c292af 100755
--- a/t/t4203-mailmap.sh
+++ b/t/t4203-mailmap.sh
@@ -461,6 +461,11 @@ test_expect_success 'Grep author with log.mailmap' '
 	test_cmp expect actual
 '
 
+test_expect_success 'log.mailmap is true by default these days' '
+	git log --author Santa | grep Author >actual &&
+	test_cmp expect actual
+'
+
 test_expect_success 'Only grep replaced author with --use-mailmap' '
 	git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
 	test_must_be_empty actual
-- 
2.23.0-rc0-155-g5fbf3435fe

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Todd Zullinger]

Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
> 
>> Jeff King <peff@peff.net> writes:
>>
>>>> +	if (mailmap < 0)
>>>>  		mailmap = 0;
>>>> -	}
>>>
>>> This should be "mailmap = 1" to match the commit message, no? (Which
>>> also implies we may want a new test).
>>
[...]
> +test_expect_success 'log.mailmap is true by default these days' '
> +	git log --author Santa | grep Author >actual &&
> +	test_cmp expect actual
> +'
> +
>  test_expect_success 'Only grep replaced author with --use-mailmap' '
>  	git log --use-mailmap --author "<cto@coompany.xx>" >actual &&
>  	test_must_be_empty actual

With log.mailmap true by default, should we also have some
tests to ensure that --no-use-mailmap and log.mailmap=False
do the right thing?  (I mean eventually, not necessarily
with this patch as extra work for you Junio.)

(If I was certain the answer is "yes" and more familiar with
t4203, I would have sent this in diff format.)

-- 
Todd

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jonathan Nieder]

Junio C Hamano wrote:

> I suspect that you may have misread the "is interactive" bit in the
> original; that was used only to decide if we are going to warn.

Ah.  That was indeed confusing.  Anyway, it's nice to see the complexity
go away.

[...]
> +++ b/builtin/log.c
[...]
> @@ -214,12 +204,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>  	memset(&w, 0, sizeof(w));
>  	userformat_find_requirements(NULL, &w);
>  
> -	if (mailmap < 0) {
> -		if (session_is_interactive() && !rev->pretty_given)
> -			warning("%s\n", _(warn_unspecified_mailmap_msg));
> -
> +	if (mailmap < 0)
>  		mailmap = 0;

As Peff noticed, this should say "mailmap = 1" (which I see you've done
in "pu").  We can simplify further by removing the "-1" case --- we do
not need to distinguish between "on" and "unspecified" any more.

We'll also want to update the docs.  And as Todd suggests, we should
cover how to disable mailmap in tests.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---

diff --git i/Documentation/config/log.txt w/Documentation/config/log.txt
index 7798e10cb0..e9e1e397f3 100644
--- i/Documentation/config/log.txt
+++ w/Documentation/config/log.txt
@@ -41,4 +41,4 @@ log.showSignature::
 log.mailmap::
 	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
 	linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
-	assume `--no-use-mailmap`. False by default.
+	assume `--no-use-mailmap`. True by default.
diff --git i/builtin/log.c w/builtin/log.c
index 02fa179077..44b10b3415 100644
--- i/builtin/log.c
+++ w/builtin/log.c
@@ -47,7 +47,7 @@ static int default_follow;
 static int default_show_signature;
 static int decoration_style;
 static int decoration_given;
-static int use_mailmap_config = -1;
+static int use_mailmap_config = 1;
 static const char *fmt_patch_subject_prefix = "PATCH";
 static const char *fmt_pretty;
 
@@ -160,7 +160,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 			 struct rev_info *rev, struct setup_revision_opt *opt)
 {
 	struct userformat_want w;
-	int quiet = 0, source = 0, mailmap = 0;
+	int quiet = 0, source = 0, mailmap;
 	static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
 	static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
 	static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
@@ -204,9 +204,6 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 	memset(&w, 0, sizeof(w));
 	userformat_find_requirements(NULL, &w);
 
-	if (mailmap < 0)
-		mailmap = 1;
-
 	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 		rev->show_notes = 1;
 	if (rev->show_notes)
diff --git i/t/t4203-mailmap.sh w/t/t4203-mailmap.sh
index ede0c292af..918ada69eb 100755
--- i/t/t4203-mailmap.sh
+++ w/t/t4203-mailmap.sh
@@ -442,6 +442,34 @@ test_expect_success 'Log output with log.mailmap' '
 	test_cmp expect actual
 '
 
+test_expect_success 'log.mailmap=false disables mailmap' '
+	cat >expect <<-\EOF &&
+	Author: CTO <cto@coompany.xx>
+	Author: claus <me@company.xx>
+	Author: santa <me@company.xx>
+	Author: nick2 <nick2@company.xx>
+	Author: nick2 <bugs@company.xx>
+	Author: nick1 <bugs@company.xx>
+	Author: A U Thor <author@example.com>
+	EOF
+	git -c log.mailmap=False log | grep Author > actual &&
+	test_cmp expect actual
+'
+
+test_expect_success '--no-use-mailmap disables mailmap' '
+	cat >expect <<-\EOF &&
+	Author: CTO <cto@coompany.xx>
+	Author: claus <me@company.xx>
+	Author: santa <me@company.xx>
+	Author: nick2 <nick2@company.xx>
+	Author: nick2 <bugs@company.xx>
+	Author: nick1 <bugs@company.xx>
+	Author: A U Thor <author@example.com>
+	EOF
+	git log --no-use-mailmap | grep Author > actual &&
+	test_cmp expect actual
+'
+
 cat >expect <<\EOF
 Author: Santa Claus <santa.claus@northpole.xx>
 Author: Santa Claus <santa.claus@northpole.xx>

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Junio C Hamano]

Jonathan Nieder <jrnieder@gmail.com> writes:

> We'll also want to update the docs.  And as Todd suggests, we should
> cover how to disable mailmap in tests.
>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> ---

I avoided the "don't bother initializing use_mailmap_config to
unknown" simplification, but I guess the change is clear enough.

> diff --git i/Documentation/config/log.txt w/Documentation/config/log.txt
> index 7798e10cb0..e9e1e397f3 100644
> --- i/Documentation/config/log.txt
> +++ w/Documentation/config/log.txt
> @@ -41,4 +41,4 @@ log.showSignature::
>  log.mailmap::
>  	If true, makes linkgit:git-log[1], linkgit:git-show[1], and
>  	linkgit:git-whatchanged[1] assume `--use-mailmap`, otherwise
> -	assume `--no-use-mailmap`. False by default.
> +	assume `--no-use-mailmap`. True by default.

Good.  Thanks for being extra careful.

> diff --git i/builtin/log.c w/builtin/log.c
> index 02fa179077..44b10b3415 100644
> --- i/builtin/log.c
> +++ w/builtin/log.c
> @@ -47,7 +47,7 @@ static int default_follow;
>  static int default_show_signature;
>  static int decoration_style;
>  static int decoration_given;
> -static int use_mailmap_config = -1;
> +static int use_mailmap_config = 1;
>  static const char *fmt_patch_subject_prefix = "PATCH";
>  static const char *fmt_pretty;
>  
> @@ -160,7 +160,7 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>  			 struct rev_info *rev, struct setup_revision_opt *opt)
>  {
>  	struct userformat_want w;
> -	int quiet = 0, source = 0, mailmap = 0;
> +	int quiet = 0, source = 0, mailmap;
>  	static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
>  	static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
>  	static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
> @@ -204,9 +204,6 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
>  	memset(&w, 0, sizeof(w));
>  	userformat_find_requirements(NULL, &w);
>  
> -	if (mailmap < 0)
> -		mailmap = 1;
> -
>  	if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
>  		rev->show_notes = 1;
>  	if (rev->show_notes)



> diff --git i/t/t4203-mailmap.sh w/t/t4203-mailmap.sh
> index ede0c292af..918ada69eb 100755
> --- i/t/t4203-mailmap.sh
> +++ w/t/t4203-mailmap.sh
> @@ -442,6 +442,34 @@ test_expect_success 'Log output with log.mailmap' '
>  	test_cmp expect actual
>  '
>  
> +test_expect_success 'log.mailmap=false disables mailmap' '
> +	cat >expect <<-\EOF &&
> +	Author: CTO <cto@coompany.xx>
> +	Author: claus <me@company.xx>
> +	Author: santa <me@company.xx>
> +	Author: nick2 <nick2@company.xx>
> +	Author: nick2 <bugs@company.xx>
> +	Author: nick1 <bugs@company.xx>
> +	Author: A U Thor <author@example.com>
> +	EOF
> +	git -c log.mailmap=False log | grep Author > actual &&
> +	test_cmp expect actual
> +'
> +
> +test_expect_success '--no-use-mailmap disables mailmap' '
> +	cat >expect <<-\EOF &&
> +	Author: CTO <cto@coompany.xx>
> +	Author: claus <me@company.xx>
> +	Author: santa <me@company.xx>
> +	Author: nick2 <nick2@company.xx>
> +	Author: nick2 <bugs@company.xx>
> +	Author: nick1 <bugs@company.xx>
> +	Author: A U Thor <author@example.com>
> +	EOF
> +	git log --no-use-mailmap | grep Author > actual &&
> +	test_cmp expect actual
> +'
> +
>  cat >expect <<\EOF
>  Author: Santa Claus <santa.claus@northpole.xx>
>  Author: Santa Claus <santa.claus@northpole.xx>

Re: Git for Windows v2.23.0-rc0, was Re: [ANNOUNCE] Git v2.23.0-rc0

[Jeff King]

On Fri, Aug 02, 2019 at 09:53:55AM -0700, Junio C Hamano wrote:

> Jonathan Nieder <jrnieder@gmail.com> writes:
> 
> > We'll also want to update the docs.  And as Todd suggests, we should
> > cover how to disable mailmap in tests.
> >
> > Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> > ---
> 
> I avoided the "don't bother initializing use_mailmap_config to
> unknown" simplification, but I guess the change is clear enough.

Yeah, I didn't even look to see if there were further simplifications
possible, but seeing Jonathan's patch, it looks like an obvious
improvement. And a quick grep shows that there are no other sites that
should be affected by losing the "-1" semantics, so I think it's a good
idea.

And of course the doc and test improvements are very welcome. :)

-Peff