diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2022-03-05 01:13:49 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2022-03-05 01:39:11 +0100 |
commit | aca8568e2c342b1764837df29468ed498b5e6dcd (patch) | |
tree | 1dd2a53f34b828f8cc922ddfe7a377921e49557e /t/t7408-submodule-reference.sh | |
parent | The eighth batch (diff) | |
download | git-aca8568e2c342b1764837df29468ed498b5e6dcd.tar.xz git-aca8568e2c342b1764837df29468ed498b5e6dcd.zip |
submodule tests: test for init and update failure output
Amend some submodule tests to test for the failure output of "git
submodule [update|init]". The lack of such tests hid a regression in
an earlier version of a subsequent commit.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7408-submodule-reference.sh')
-rwxr-xr-x | t/t7408-submodule-reference.sh | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/t/t7408-submodule-reference.sh b/t/t7408-submodule-reference.sh index a3892f494b..c3a4545510 100755 --- a/t/t7408-submodule-reference.sh +++ b/t/t7408-submodule-reference.sh @@ -193,7 +193,19 @@ test_expect_success 'missing nested submodule alternate fails clone and submodul cd supersuper-clone && check_that_two_of_three_alternates_are_used && # update of the submodule fails - test_must_fail git submodule update --init --recursive + cat >expect <<-\EOF && + fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist + Failed to clone '\''sub'\''. Retry scheduled + fatal: submodule '\''sub-dissociate'\'' cannot add alternate: path ... does not exist + Failed to clone '\''sub-dissociate'\''. Retry scheduled + fatal: submodule '\''sub'\'' cannot add alternate: path ... does not exist + Failed to clone '\''sub'\'' a second time, aborting + fatal: Failed to recurse into submodule path ... + EOF + test_must_fail git submodule update --init --recursive 2>err && + grep -e fatal: -e ^Failed err >actual.raw && + sed -e "s/path $SQ[^$SQ]*$SQ/path .../" <actual.raw >actual && + test_cmp expect actual ) ' |