Fix mismerged update-index from jc/cache-tree branch.

diff --git a/git.c b/git.c
index 619c6654e45d0208adefc6aecf723c5c25fd4a7b..b761150c29eaee5e1faf102e27a08f87c831aa64 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"