Merge branch 'jc/grep' into next

diff --git a/update-index.c b/update-index.c
index 4c6bcfaedd6cd6bb53c0d783ef49fcd24b191850..1c1f13bd7044ad78800b4f9faa0ff1b05b9b6c21 100644 (file)
--- a/update-index.c
+++ b/update-index.c
@@ -8,7 +8,6 @@
 #include "quote.h"
 #include "cache-tree.h"
 #include "tree-walk.h"
-#include "cache-tree.h"
 
 /*
  * Default to not allowing changes to the list of files. The