Merge branch 'jt/diff-lazy-fetch-submodule-fix'

diff --git a/tmp-objdir.c b/tmp-objdir.c
index b2d9280f104aec7095dd2b37ff1f7165355b5388..91c00567f4d63367d6766808b0ff90f6faa08765 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -6,6 +6,7 @@
 #include "strbuf.h"
 #include "argv-array.h"
 #include "quote.h"
+#include "object-store.h"
 
 struct tmp_objdir {
        struct strbuf path;
@@ -126,7 +127,7 @@ struct tmp_objdir *tmp_objdir_create(void)
        struct tmp_objdir *t;
 
        if (the_tmp_objdir)
-               die("BUG: only one tmp_objdir can be used at a time");
+               BUG("only one tmp_objdir can be used at a time");
 
        t = xmalloc(sizeof(*t));
        strbuf_init(&t->path, 0);