{"thread":{"id":"48723","subject":"[PATCH] t7406-submodule-update: fix broken &&-chains","startedAt":"2018-06-16T20:33:27Z","lastAt":"2018-06-18T17:48:17Z","messageCount":2,"participants":["SZEDER Gábor","Stefan Beller"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"350334","messageId":"20180616203319.9558-1-szeder.dev@gmail.com","threadId":"48723","inReplyTo":null,"subject":"[PATCH] t7406-submodule-update: fix broken &&-chains","fromName":"SZEDER Gábor","fromEmail":"szeder.dev@gmail.com","sentAt":"2018-06-16T20:33:19Z","receivedAt":"2018-06-16T20:33:27Z","isPatch":true,"sender":{"key":"szeder.dev@gmail.com","avatar":"https://avatars.githubusercontent.com/u/116324?v=4"},"body":"Three tests in 't7406-submodule-update' contain broken &&-chains, but\nsince they are all in subshells, chain-lint couldn't notice them.\n\nSigned-off-by: SZEDER Gábor <szeder.dev@gmail.com>\n---\n t/t7406-submodule-update.sh | 12 ++++++------\n 1 file changed, 6 insertions(+), 6 deletions(-)\n\ndiff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh\nindex 6f083c4d68..9e0d31700e 100755\n--- a/t/t7406-submodule-update.sh\n+++ b/t/t7406-submodule-update.sh\n@@ -65,7 +65,7 @@ test_expect_success 'setup a submodule tree' '\n \t git commit -m \"none\"\n \t) &&\n \tgit clone . recursivesuper &&\n-\t( cd recursivesuper\n+\t( cd recursivesuper &&\n \t git submodule add ../super super\n \t)\n '\n@@ -245,13 +245,13 @@ test_expect_success 'submodule update --remote should fetch upstream changes wit\n \t(\n \t\tcd super &&\n \t\tgit submodule update --remote --force submodule &&\n-\t\tgit -C submodule log -1 --oneline >actual\n-\t\tgit -C ../submodule log -1 --oneline master >expect\n+\t\tgit -C submodule log -1 --oneline >actual &&\n+\t\tgit -C ../submodule log -1 --oneline master >expect &&\n \t\ttest_cmp expect actual &&\n \t\tgit checkout -b test-branch &&\n \t\tgit submodule update --remote --force submodule &&\n-\t\tgit -C submodule log -1 --oneline >actual\n-\t\tgit -C ../submodule log -1 --oneline test-branch >expect\n+\t\tgit -C submodule log -1 --oneline >actual &&\n+\t\tgit -C ../submodule log -1 --oneline test-branch >expect &&\n \t\ttest_cmp expect actual &&\n \t\tgit checkout master &&\n \t\tgit branch -d test-branch &&\n@@ -891,7 +891,7 @@ test_expect_success 'submodule update properly revives a moved submodule' '\n \t rm -rf submodule2 &&\n \t mkdir -p \"moved/sub module\" &&\n \t git update-index --add --cacheinfo 160000 $H \"moved/sub module\" &&\n-\t git config -f .gitmodules submodule.submodule2.path \"moved/sub module\"\n+\t git config -f .gitmodules submodule.submodule2.path \"moved/sub module\" &&\n \t git commit -am \"post move\" &&\n \t git submodule update &&\n \t git status | sed \"s/$H2/XXX/\" >actual &&\n-- \n2.18.0.rc0.207.ga6211da864\n\n"},{"id":"350404","messageId":"CAGZ79kaijLGr4LBWyS5z6QwNzmPkrNVGcatpqW0nnBWwOUe4Mw@mail.gmail.com","threadId":"48723","inReplyTo":"20180616203319.9558-1-szeder.dev@gmail.com","subject":"Re: [PATCH] t7406-submodule-update: fix broken &&-chains","fromName":"Stefan Beller","fromEmail":"sbeller@google.com","sentAt":"2018-06-18T17:48:02Z","receivedAt":"2018-06-18T17:48:17Z","isPatch":true,"sender":{"key":"stefanbeller@gmail.com","avatar":"https://avatars.githubusercontent.com/u/455868?v=4"},"body":"On Sat, Jun 16, 2018 at 1:33 PM SZEDER Gábor <szeder.dev@gmail.com> wrote:\n>\n> Three tests in 't7406-submodule-update' contain broken &&-chains, but\n> since they are all in subshells, chain-lint couldn't notice them.\n>\n> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>\n\nThis looks good to me;\n\nThanks for spotting and fixing it,\nStefan\n"}]}