Merge branch 'aw/pretty-trailers'

diff --git a/builtin/describe.c b/builtin/describe.c
index bc97e50650a39e03448c1c4e5dd0e8f880b9befc..1409cedce2fb08dc24b57db9e3a3591c3760d8af 100644 (file)
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -1,3 +1,4 @@
+#define USE_THE_INDEX_COMPATIBILITY_MACROS
 #include "cache.h"
 #include "config.h"
 #include "lockfile.h"
@@ -629,6 +630,7 @@ int cmd_describe(int argc, const char **argv, const char *prefix)
                        struct argv_array args = ARGV_ARRAY_INIT;
                        int fd, result;
 
+                       setup_work_tree();
                        read_cache();
                        refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
                                      NULL, NULL, NULL);