From: Shourya Shukla <shouryashukla.oo@gmail.com> To: git@vger.kernel.org Cc: gitster@pobox.com, christian.couder@gmail.com, kaartic.sivaraam@gmail.com, johannes.schindelin@gmx.de, liu.denton@gmail.com, Shourya Shukla <shouryashukla.oo@gmail.com>, Christian Couder <chriscool@tuxfamily.org> Subject: [PATCH v2 4/5] t7421: introduce a test script for verifying 'summary' output Date: Thu, 6 Aug 2020 22:11:01 +0530 [thread overview] Message-ID: <20200806164102.6707-5-shouryashukla.oo@gmail.com> (raw) In-Reply-To: <20200806164102.6707-1-shouryashukla.oo@gmail.com> 't7401-submodule-summary.sh' uses 'git add' to add submodules. Therefore, some commands such as 'git submodule init' and 'git submodule deinit' do not work as expected. So, introduce a test script for verifying the 'summary' output for submodules added using 'git submodule add'. Mentored-by: Christian Couder <chriscool@tuxfamily.org> Mentored-by: Kaartic Sivaraam <kaartic.sivaraam@gmail.com> Signed-off-by: Shourya Shukla <shouryashukla.oo@gmail.com> --- t/t7421-submodule-summary-add.sh | 69 ++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100755 t/t7421-submodule-summary-add.sh diff --git a/t/t7421-submodule-summary-add.sh b/t/t7421-submodule-summary-add.sh new file mode 100755 index 0000000000..829fe26d6d --- /dev/null +++ b/t/t7421-submodule-summary-add.sh @@ -0,0 +1,69 @@ +#!/bin/sh +# +# Copyright (C) 2020 Shourya Shukla +# + +test_description='Summary support for submodules, adding them using git submodule add + +This test script tries to verify the sanity of summary subcommand of git submodule +while making sure to add submodules using `git submodule add` instead of +`git add` as done in t7401. +' + +. ./test-lib.sh + +test_expect_success 'summary test environment setup' ' + git init sm && + test_commit -C sm "add file" file file-content file-tag && + + git submodule add ./sm my-subm && + test_tick && + git commit -m "add submodule" +' + +test_expect_success 'submodule summary output for initialized submodule' ' + test_commit -C sm "add file2" file2 file2-content file2-tag && + git submodule update --remote && + test_tick && + git commit -m "update submodule" my-subm && + git submodule summary HEAD^ >actual && + rev1=$(git -C sm rev-parse --short HEAD^) && + rev2=$(git -C sm rev-parse --short HEAD) && + cat >expected <<-EOF && + * my-subm ${rev1}...${rev2} (1): + > add file2 + + EOF + test_cmp expected actual +' + +test_expect_success 'submodule summary output for deinitialized submodule' ' + git submodule deinit my-subm && + git submodule summary HEAD^ >actual && + test_must_be_empty actual && + git submodule update --init my-subm && + git submodule summary HEAD^ >actual && + rev1=$(git -C sm rev-parse --short HEAD^) && + rev2=$(git -C sm rev-parse --short HEAD) && + cat >expected <<-EOF && + * my-subm ${rev1}...${rev2} (1): + > add file2 + + EOF + test_cmp expected actual +' + +test_expect_success 'submodule summary output for submodules with changed paths' ' + git mv my-subm subm && + git commit -m "change submodule path" && + rev=$(git -C sm rev-parse --short HEAD^) && + git submodule summary HEAD^^ -- my-subm >actual 2>err && + test_i18ngrep "fatal:.*my-subm" err && + cat >expected <<-EOF && + * my-subm ${rev}...0000000: + + EOF + test_cmp expected actual +' + +test_done -- 2.28.0
next prev parent reply other threads:[~2020-08-06 16:49 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-08-06 16:40 [GSoC][PATCH v2 0/5] submodule: port subcommand 'summary' from shell to C Shourya Shukla 2020-08-06 16:40 ` [PATCH v2 1/5] submodule: expose the '--for-status' option of summary Shourya Shukla 2020-08-08 14:40 ` Kaartic Sivaraam 2020-08-08 20:25 ` Christian Couder 2020-08-08 23:26 ` Junio C Hamano 2020-08-06 16:40 ` [PATCH v2 2/5] submodule: remove extra line feeds between callback struct and macro Shourya Shukla 2020-08-06 16:41 ` [PATCH v2 3/5] submodule: rename helper functions to avoid ambiguity Shourya Shukla 2020-08-06 16:41 ` Shourya Shukla [this message] 2020-08-06 16:41 ` [PATCH v2 5/5] submodule: port submodule subcommand 'summary' from shell to C Shourya Shukla 2020-08-06 22:45 ` Junio C Hamano 2020-08-07 16:31 ` Shourya Shukla 2020-08-07 17:15 ` Junio C Hamano 2020-08-12 19:44 ` [GSoC][PATCH v3 0/4] submodule: port " Shourya Shukla 2020-08-12 19:44 ` [PATCH v3 1/4] submodule: remove extra line feeds between callback struct and macro Shourya Shukla 2020-08-12 19:44 ` [PATCH v3 2/4] submodule: rename helper functions to avoid ambiguity Shourya Shukla 2020-08-12 19:44 ` [PATCH v3 3/4] t7421: introduce a test script for verifying 'summary' output Shourya Shukla 2020-08-12 19:44 ` [PATCH v3 4/4] submodule: port submodule subcommand 'summary' from shell to C Shourya Shukla 2020-08-18 2:08 ` Jeff King 2020-08-21 5:22 ` Shourya Shukla 2020-08-21 15:17 ` Johannes Schindelin 2020-08-21 16:35 ` Junio C Hamano 2020-08-21 17:17 ` Shourya Shukla 2020-08-21 18:09 ` Junio C Hamano 2020-08-21 18:54 ` Kaartic Sivaraam 2020-08-21 19:54 ` Junio C Hamano 2020-08-23 20:03 ` Kaartic Sivaraam 2020-08-23 20:12 ` Kaartic Sivaraam 2020-08-24 7:26 ` Shourya Shukla 2020-08-24 8:46 ` Shourya Shukla 2020-08-24 11:08 ` Kaartic Sivaraam 2020-08-24 17:50 ` Shourya Shukla 2020-08-24 17:54 ` Junio C Hamano
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200806164102.6707-5-shouryashukla.oo@gmail.com \ --to=shouryashukla.oo@gmail.com \ --cc=chriscool@tuxfamily.org \ --cc=christian.couder@gmail.com \ --cc=git@vger.kernel.org \ --cc=gitster@pobox.com \ --cc=johannes.schindelin@gmx.de \ --cc=kaartic.sivaraam@gmail.com \ --cc=liu.denton@gmail.com \ --subject='Re: [PATCH v2 4/5] t7421: introduce a test script for verifying '\''summary'\'' output' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).