diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-08-31 23:18:02 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-09-02 16:16:24 (GMT) |
| commit | 0b917a9f5cb21ca1655daf549108361602e912f3 (patch) | |
| tree | 5b03d48cd74cac4e5de592dd3c2228a0e824fcbb | |
| parent | addda284cbcde90b8b541caf94f198ed2f6bd936 (diff) | |
| download | git-0b917a9f5cb21ca1655daf549108361602e912f3.zip git-0b917a9f5cb21ca1655daf549108361602e912f3.tar.gz git-0b917a9f5cb21ca1655daf549108361602e912f3.tar.bz2 | |
submodule--helper: return "ret", not "1" from update_submodule()
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>
Reviewed-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/submodule--helper.c | 2 | ||||
| -rwxr-xr-x | 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 d76ee03..d6a8273 100644 --- a/builtin/submodule--helper.c +++ b/builtin/submodule--helper.c @@ -2445,7 +2445,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 6cc0746..c5f5dbe 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 ) && |