Merge branch 'pw/rebase-x-sanity-check'

diff --git a/convert.c b/convert.c
index d8d7df3353817535c6e9b093bc5d8b711b872ca4..5d0307fc1004f215c48a6f653e21da41bee71baa 100644 (file)
--- a/convert.c
+++ b/convert.c
@@ -1,4 +1,3 @@
-#define NO_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
 #include "object-store.h"