Merge branch 'ab/get-short-oid'

diff --git a/builtin/branch.c b/builtin/branch.c
index efc9ac1922c8c45e13cddb82a342885153ae0fba..5bb5123e7290d4a72672436737a8a56c647acbb6 100644 (file)
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -500,7 +500,7 @@ static void copy_or_rename_branch(const char *oldname, const char *newname, int
 
        if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) ||
            !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) {
-               die("BUG: expected prefix missing for refs");
+               BUG("expected prefix missing for refs");
        }
 
        if (copy)