From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Oct 2021 22:47:57 +0000 (-0700)
Subject: Merge branch 'cm/save-restore-terminal'
X-Git-Tag: v2.34.0-rc0~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=853ec9aa9be1b467986dd86ffc36c1c8580a6789;p=thirdparty%2Fgit.git

Merge branch 'cm/save-restore-terminal'

An editor session launched during a Git operation (e.g. during 'git
commit') can leave the terminal in a funny state.  The code path
has updated to save the terminal state before, and restore it
after, it spawns an editor.

* cm/save-restore-terminal:
  editor: save and reset terminal after calling EDITOR
  terminal: teach git how to save/restore its terminal settings
---

853ec9aa9be1b467986dd86ffc36c1c8580a6789