Merge branch 'master' into next

* master:
  Fix "git help -a" terminal autosizing
  diff-index: fix compilation warnings.

diff --git a/builtin-help.c b/builtin-help.c
index 10a59cc..7470faa 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"

diff --git a/diff-index.c b/diff-index.c
index 8694012..8c9f601 100644 (file)
--- a/diff-index.c
+++ b/diff-index.c
@@ -11,7 +11,6 @@ COMMON_DIFF_OPTIONS_HELP;
 int main(int argc, const char **argv)
 {
        struct rev_info rev;
-       int match_missing = 0;
        int cached = 0;
        int i;
 

diff --git a/git.c b/git.c
index 619c665..b761150 100644 (file)
--- 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"