Merge branch 'ls/editor-waiting-message'

Git shows a message to tell the user that it is waiting for the
user to finish editing when spawning an editor, in case the editor
opens to a hidden window or somewhere obscure and the user gets
lost.

* ls/editor-waiting-message:
launch_editor(): indicate that Git waits for user input
refactor "dumb" terminal determination

diff --cc Documentation/config.txt
index 9fac2f2b88c4b26a771b698b40483f3472600c96,6ebc50eea8a63e5feac9e84b48ee98f0f1f460a5..b18c0f97fec8dda4ba90a245f8e827b57a585cf4
--- 1/Documentation/config.txt
--- 2/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -351,9 -351,9 +351,12 @@@ advice.*:
        addEmbeddedRepo::
                Advice on what to do when you've accidentally added one
                git repo inside of another.
 +      ignoredHook::
 +              Advice shown if an hook is ignored because the hook is not
 +              set as executable.
+       waitingForEditor::
+               Print a message to the terminal whenever Git is waiting for
+               editor input from the user.
  --
  
  core.fileMode::

diff --cc advice.c
index c6169bcb52fa935969ee938967adb337b06961c7,af29d23e43173ce8af60bffa6ebb32a73754fa36..406efc183ba272b94a39d4cc7e97d7483a40a9d4
--- 1/advice.c
--- 2/advice.c
+++ b/advice.c
@@@ -17,7 -17,7 +17,8 @@@ int advice_set_upstream_failure = 1
  int advice_object_name_warning = 1;
  int advice_rm_hints = 1;
  int advice_add_embedded_repo = 1;
 +int advice_ignored_hook = 1;
+ int advice_waiting_for_editor = 1;
  
  static struct {
        const char *name;
@@@ -39,7 -39,7 +40,8 @@@
        { "objectnamewarning", &advice_object_name_warning },
        { "rmhints", &advice_rm_hints },
        { "addembeddedrepo", &advice_add_embedded_repo },
 +      { "ignoredhook", &advice_ignored_hook },
+       { "waitingforeditor", &advice_waiting_for_editor },
  
        /* make this an alias for backward compatibility */
        { "pushnonfastforward", &advice_push_update_rejected }

diff --cc advice.h
index f525d6f89cb44dc39188dd06472cf8a59b56f411,f7cbbd342fc9d41b34a48a23b1b6c67247bf3351..70568fa7922d8aea403e415f9b9b554a88ace293
--- 1/advice.h
--- 2/advice.h
+++ b/advice.h
@@@ -19,7 -19,7 +19,8 @@@ extern int advice_set_upstream_failure
  extern int advice_object_name_warning;
  extern int advice_rm_hints;
  extern int advice_add_embedded_repo;
 +extern int advice_ignored_hook;
+ extern int advice_waiting_for_editor;
  
  int git_default_advice_config(const char *var, const char *value);
  __attribute__((format (printf, 1, 2)))

diff --cc cache.h
Simple merge