Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: git/git
base: a4b9fb6a5cf1f7cf015b3d114b364730f6b74ead
Choose a base ref
...
head repository: git/git
compare: 3d411afabc9a96f41d47c07d6af6edda3d29ec92
Choose a head ref
  • 2 commits
  • 3 files changed
  • 1 contributor

Commits on Oct 6, 2021

  1. terminal: teach git how to save/restore its terminal settings 

    Currently, git will share its console with all its children (unless
they create their own), and is therefore possible that any of them
that might change the settings for it could affect its operations once
completed.

Refactor the platform specific functionality to save the terminal
settings and expand it to also do so for the output handler.

This will allow for the state of the terminal to be saved and
restored around a child that might misbehave (ex vi) which will
be implemented next.

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @carenas @gitster
    carenas authored and gitster committed Oct 6, 2021
    Copy the full SHA
    e22b245 View commit details
    Browse the repository at this point in the history

  2. editor: save and reset terminal after calling EDITOR 

    When EDITOR is invoked to modify a commit message, it will likely
change the terminal settings, and if it misbehaves will leave the
terminal output damaged as shown in a recent report from Windows
Terminal[1]

Instead use the functions provided by compat/terminal to save the
settings and recover safely.

[1] microsoft/terminal#9359

Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
    @carenas @gitster
    carenas authored and gitster committed Oct 6, 2021
    Copy the full SHA
    3d411af View commit details
    Browse the repository at this point in the history