[PATCH v3 19/32] submodule--helper: return "ret", not "1" from update_submodule()
- From
Ævar Arnfjörð Bjarmason <avarab@gmail.com>
- Date
- Aug 21, 2022, 13:57 UTC
- Message-ID
- <patch-v3-19.32-92e17c37839-20220821T130231Z-avarab@gmail.com>
- In-Reply-To
- <cover-v3-00.32-00000000000-20220821T130231Z-avarab@gmail.com>
Amend the update_submodule() function to return the failing "ret" on error, instead of overriding it with "1".
This code was added in b3c5f5cb048 (submodule: move core cmd_update() logic to C, 2022-03-15), and this change ends up not making a difference as this function is only called in update_submodules(). If we return non-zero here we'll always in turn return "1" in module_update().
But if we didn't do that and returned any other non-zero exit code in update_submodules() we'd fail the test that's being amended here. We're still testing the status quo here.
This change makes subsequent refactoring of update_submodule() easier, as we'll no longer need to worry about clobbering the "ret" we get from the run_command().
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> --- builtin/submodule--helper.c | 2 +- t/t7406-submodule-update.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c index fed92585a02..61468237af2 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2446,7 +2446,7 @@ static int update_submodule(struct update_data *update_data) update_data->displaypath); if (ret == 128) exit(ret); - return 1; + return ret; } return 0; diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 6cc07460dd2..c5f5dbe55e0 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -769,7 +769,7 @@ test_expect_success 'submodule update continues after recursive checkout error' echo "" > file ) ) && - test_must_fail git submodule update --recursive && + test_expect_code 1 git submodule update --recursive && (cd submodule2 && git rev-parse --verify HEAD >../actual ) &&
-- 2.37.2.1279.g64dec4e13cf