receive-pack: use bug() and BUG_if_bug()

Amend code added in a6a84319686 (receive-pack.c: shorten the
execute_commands loop over all commands, 2015-01-07) and amended to
hard die in b6a4788586d (receive-pack.c: die instead of error in case
of possible future bug, 2015-01-07) to use the new bug() function
instead.

Let's also rename the warn_if_*() function that code is in to
BUG_if_*(), its name became outdated in b6a4788586d.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index daa153d04461005fc031f9c4e51fc299bbef2883..4a62327dee99bbb4c033380a9bb7c26aaf1637d5 100644 (file)
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -1810,21 +1810,17 @@ static int should_process_cmd(struct command *cmd)
        return !cmd->error_string && !cmd->skip_update;
 }
 
-static void warn_if_skipped_connectivity_check(struct command *commands,
+static void BUG_if_skipped_connectivity_check(struct command *commands,
                                               struct shallow_info *si)
 {
        struct command *cmd;
-       int checked_connectivity = 1;
 
        for (cmd = commands; cmd; cmd = cmd->next) {
-               if (should_process_cmd(cmd) && si->shallow_ref[cmd->index]) {
-                       error("BUG: connectivity check has not been run on ref %s",
-                             cmd->ref_name);
-                       checked_connectivity = 0;
-               }
+               if (should_process_cmd(cmd) && si->shallow_ref[cmd->index])
+                       bug("connectivity check has not been run on ref %s",
+                           cmd->ref_name);
        }
-       if (!checked_connectivity)
-               BUG("connectivity check skipped???");
+       BUG_if_bug("connectivity check skipped???");
 }
 
 static void execute_commands_non_atomic(struct command *commands,
@@ -2005,7 +2001,7 @@ static void execute_commands(struct command *commands,
                execute_commands_non_atomic(commands, si);
 
        if (shallow_update)
-               warn_if_skipped_connectivity_check(commands, si);
+               BUG_if_skipped_connectivity_check(commands, si);
 }
 
 static struct command **queue_command(struct command **tail,