Merge branch 'ab/get-short-oid'

diff --git a/builtin/pull.c b/builtin/pull.c
index c719a4f9d738b4c30f82812397c11595b1a4e936..25f7db5b3a2bcd6f4ad477b752a3f7c77c64f943 100644 (file)
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -543,7 +543,7 @@ static int run_fetch(const char *repo, const char **refspecs)
                argv_array_push(&args, repo);
                argv_array_pushv(&args, refspecs);
        } else if (*refspecs)
-               die("BUG: refspecs without repo?");
+               BUG("refspecs without repo?");
        ret = run_command_v_opt(args.argv, RUN_GIT_CMD);
        argv_array_clear(&args);
        return ret;