summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@osdl.org>2006-04-27 16:02:54 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-27 18:45:39 (GMT)
commit83aa18eade572679319406d6dc12a81599a4d57e (patch)
tree52182b2d3d1d79397e9e5e5d17257e9124944873
parent61678d87c2aad3bd668196993d8c32f298ddf5ff (diff)
downloadgit-83aa18eade572679319406d6dc12a81599a4d57e.zip
git-83aa18eade572679319406d6dc12a81599a4d57e.tar.gz
git-83aa18eade572679319406d6dc12a81599a4d57e.tar.bz2
Fix "git help -a" terminal autosizing
When I split out the builtin commands into their own files, I left the include of <sys/ioctl.h> in git.c rather than moving it to the file that needed it (builtin-help.c). Nobody seems to have noticed, because everything still worked, but because the TIOCGWINSZ macro was now no longer defined when compiling the "term_columns()" function, it would no longer automatically notice the terminal size unless your system used the ancient "COLUMNS" environment variable approach. Trivially fixed by just moving the header include to the file that actually needs it. Signed-off-by: Linus Torvalds <torvalds@osdl.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--builtin-help.c1
-rw-r--r--git.c1
2 files changed, 1 insertions, 1 deletions
diff --git a/builtin-help.c b/builtin-help.c
index 10a59cc..7470faa 100644
--- 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"
diff --git a/git.c b/git.c
index aa2b814..01b7e28 100644
--- a/git.c
+++ b/git.c
@@ -8,7 +8,6 @@
#include <errno.h>
#include <limits.h>
#include <stdarg.h>
-#include <sys/ioctl.h>
#include "git-compat-util.h"
#include "exec_cmd.h"