Merge branch 'nd/travis-gcc-8'

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index a71f6bd088a2666f0637463e1c168171dd319a96..967b2b3380d9a1eb0ccea9a742c8abfb4004602b 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -166,7 +166,7 @@ static void show_killed_files(const struct index_state *istate,
                                 */
                                pos = index_name_pos(istate, ent->name, ent->len);
                                if (0 <= pos)
-                                       die("BUG: killed-file %.*s not found",
+                                       BUG("killed-file %.*s not found",
                                                ent->len, ent->name);
                                pos = -pos - 1;
                                while (pos < istate->cache_nr &&