Merge branch 'js/visual-studio'

diff --git a/tmp-objdir.c b/tmp-objdir.c
index fea3f55545cbf193f823db468c7640bfd48d9bbd..91c00567f4d63367d6766808b0ff90f6faa08765 100644 (file)
--- a/tmp-objdir.c
+++ b/tmp-objdir.c
@@ -127,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);