Merge branch 'rs/copy-array' into maint

diff --git a/dir-iterator.c b/dir-iterator.c
index 34182a9a1c10244126e03a2b117bd8bc75bd9871..f2dcd82fde9723be1e53770ad25af42ec547869a 100644 (file)
--- a/dir-iterator.c
+++ b/dir-iterator.c
@@ -188,7 +188,7 @@ struct dir_iterator *dir_iterator_begin(const char *path)
        struct dir_iterator *dir_iterator = &iter->base;
 
        if (!path || !*path)
-               die("BUG: empty path passed to dir_iterator_begin()");
+               BUG("empty path passed to dir_iterator_begin()");
 
        strbuf_init(&iter->base.path, PATH_MAX);
        strbuf_addstr(&iter->base.path, path);