Merge branch 'sb/string-list-remove-unused' into maint

diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index 526da5c1856ed1c387975a767f4d01382d1ea1a9..9ada4f4dfd8747d3888203749f057915f7c9ab46 100644 (file)
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -6,10 +6,11 @@
  */
 #include "builtin.h"
 #include "config.h"
+#include "object-store.h"
 #include "blob.h"
 #include "quote.h"
 #include "parse-options.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 
 /*
  * This is to create corrupt objects for debugging and as such it