Merge branch 'maint'

diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index c7e600db4745c80fddcb14986bc192d80630aa51..5a67c8181e5273ab0e79b8cb704dadc87cde1a37 100644 (file)
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -207,7 +207,7 @@ static void parse_pack_header(void)
 static NORETURN void bad_object(unsigned long offset, const char *format,
                       ...) __attribute__((format (printf, 2, 3)));
 
-static void bad_object(unsigned long offset, const char *format, ...)
+static NORETURN void bad_object(unsigned long offset, const char *format, ...)
 {
        va_list params;
        char buf[1024];