Merge branch 'mp/for-each-ref-missing-name-or-email'

diff --git a/lockfile.c b/lockfile.c
index efcb7d7dfe30a2fbad03244ba4ca9e536a3649e4..8e8ab4f29f3eaf05f056211042b5fd2f01727363 100644 (file)
--- a/lockfile.c
+++ b/lockfile.c
@@ -193,7 +193,7 @@ char *get_locked_file_path(struct lock_file *lk)
        strbuf_addstr(&ret, get_tempfile_path(lk->tempfile));
        if (ret.len <= LOCK_SUFFIX_LEN ||
            strcmp(ret.buf + ret.len - LOCK_SUFFIX_LEN, LOCK_SUFFIX))
-               die("BUG: get_locked_file_path() called for malformed lock object");
+               BUG("get_locked_file_path() called for malformed lock object");
        /* remove ".lock": */
        strbuf_setlen(&ret, ret.len - LOCK_SUFFIX_LEN);
        return strbuf_detach(&ret, NULL);