Merge branch 'ls/editor-waiting-message'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:59 +0000 (11:33 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Dec 2017 19:33:59 +0000 (11:33 -0800)
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

1  2 
Documentation/config.txt
advice.c
advice.h
cache.h

@@@ -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
+++ 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
+++ 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