git-am: Don't accept an mbox on stdin of we already have a .dotest directory

diff --git a/builtin-help.c b/builtin-help.c
index 10a59cc403d68166c614f2cf023d62413c5c1fcb..335fe5fedcc6523a3b49a3e00686fe381098bcda 100644 (file)
--- a/builtin-help.c
+++ b/builtin-help.c
@@ -3,6 +3,7 @@
  *
  * Builtin help-related commands (help, usage, version)
  */
+#include <sys/ioctl.h>
 #include "cache.h"
 #include "builtin.h"
 #include "exec_cmd.h"
@@ -11,7 +12,7 @@
 static const char git_usage[] =
        "Usage: git [--version] [--exec-path[=GIT_EXEC_PATH]] [--help] COMMAND [ ARGS ]";
 
-/* most gui terms set COLUMNS (although some don't export it) */
+/* most GUI terminals set COLUMNS (although some don't export it) */
 static int term_columns(void)
 {
        char *col_string = getenv("COLUMNS");