]> git.ipfire.org Git - thirdparty/git.git/commitdiff
submodule--helper: don't call submodule_strategy_to_string() in BUG()
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Wed, 31 Aug 2022 23:18:04 +0000 (01:18 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 2 Sep 2022 16:16:24 +0000 (09:16 -0700)
Don't call submodule_strategy_to_string() in a BUG() message. These
calls added in c51f8f94e5b (submodule--helper: run update procedures
from C, 2021-08-24) don't need the extra information
submodule_strategy_to_string() gives us, as we'll never reach the
SM_UPDATE_COMMAND case here.

That case is the only one where we'd get any information beyond the
straightforward number-to-string mapping.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/submodule--helper.c

index f97923ff503115be00d29e69195f08c66ced64e7..44c6dfdfbe17b9e385179d997e73295306cae618 100644 (file)
@@ -2156,8 +2156,8 @@ static int run_update_command(const struct update_data *ud, int subforce)
                must_die_on_failure = 1;
                break;
        default:
-               BUG("unexpected update strategy type: %s",
-                   submodule_strategy_to_string(&ud->update_strategy));
+               BUG("unexpected update strategy type: %d",
+                   ud->update_strategy.type);
        }
        strvec_push(&cp.args, oid);
 
@@ -2182,8 +2182,8 @@ static int run_update_command(const struct update_data *ud, int subforce)
                            ud->update_strategy.command, oid, ud->displaypath);
                        break;
                default:
-                       BUG("unexpected update strategy type: %s",
-                           submodule_strategy_to_string(&ud->update_strategy));
+                       BUG("unexpected update strategy type: %d",
+                           ud->update_strategy.type);
                }
                if (must_die_on_failure)
                        exit(128);
@@ -2213,8 +2213,8 @@ static int run_update_command(const struct update_data *ud, int subforce)
                       ud->displaypath, ud->update_strategy.command, oid);
                break;
        default:
-               BUG("unexpected update strategy type: %s",
-                   submodule_strategy_to_string(&ud->update_strategy));
+               BUG("unexpected update strategy type: %d",
+                   ud->update_strategy.type);
        }
 
        return 0;