Merge branch 'js/rebase-i-root-fix'

diff --git a/bulk-checkin.c b/bulk-checkin.c
index c0bc8de107a425c10ba750812247c481de463b02..b7e131c47a62603069185d67e5d2758175bc543f 100644 (file)
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -230,7 +230,7 @@ static int deflate_to_pack(struct bulk_checkin_state *state,
                 * pack, and write into it.
                 */
                if (!idx)
-                       die("BUG: should not happen");
+                       BUG("should not happen");
                hashfile_truncate(state->f, &checkpoint);
                state->offset = checkpoint.offset;
                finish_bulk_checkin(state);