Merge branch 'tz/gpg-test-fix'

diff --git a/builtin/rebase--interactive.c b/builtin/rebase--interactive.c
index c2c2d51a3b03edf17de5b37811dadd66ca4f774b..888390f9114321a489f8210659487ef2d2897fae 100644 (file)
--- a/builtin/rebase--interactive.c
+++ b/builtin/rebase--interactive.c
@@ -1,3 +1,4 @@
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "builtin.h"
 #include "cache.h"
 #include "config.h"