Merge branch 'bc/object-id'

diff --git a/remote.c b/remote.c
index 481bf933f390af28d7ef46b33a53b04d0f000be1..238689ae28db350a3a31ba1fae5e86a12df80ca9 100644 (file)
--- a/remote.c
+++ b/remote.c
@@ -1819,7 +1819,7 @@ static const char *branch_get_push_1(struct branch *branch, struct strbuf *err)
                }
        }
 
-       die("BUG: unhandled push situation");
+       BUG("unhandled push situation");
 }
 
 const char *branch_get_push(struct branch *branch, struct strbuf *err)