From: Calvin Wan <calvinwan@google.com>
To: git@vger.kernel.org
Cc: Calvin Wan <calvinwan@google.com>,
steadmon@google.com, peff@peff.net, gitster@pobox.com
Subject: [PATCH v2 5/6] tests: remove duplicate .gitmodules path
Date: Tue, 28 Feb 2023 18:56:41 +0000 [thread overview]
Message-ID: <20230228185642.2357806-5-calvinwan@google.com> (raw)
In-Reply-To: <20230228185253.2356546-1-calvinwan@google.com>
Swapping `git add <submodule>` to `git submodule add <submodule>`
in a previous patch created a .gitmodules file with multiple
submodules pointing to the same path in certain tests. Fix tests
so that they are run on the original added submodule rather than
a separate manually configured submodule.
Signed-off-by: Calvin Wan <calvinwan@google.com>
---
t/t4027-diff-submodule.sh | 41 ++++++--------
t/t7508-status.sh | 114 +++++++++++++++-----------------------
2 files changed, 62 insertions(+), 93 deletions(-)
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 2ee9f18b38..ce335534b9 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -127,36 +127,33 @@ test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)
git config diff.ignoreSubmodules dirty &&
git diff HEAD >actual &&
test_must_be_empty actual &&
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sub &&
+ git config --add -f .gitmodules submodule.sub.ignore none &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
- git config -f .gitmodules submodule.subname.ignore all &&
- git config -f .gitmodules submodule.subname.path sub &&
+ git config -f .gitmodules submodule.sub.ignore all &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual2 &&
test_must_be_empty actual2 &&
- git config -f .gitmodules submodule.subname.ignore untracked &&
+ git config -f .gitmodules submodule.sub.ignore untracked &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual3 &&
sed -e "1,/^@@/d" actual3 >actual3.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual3.body &&
- git config -f .gitmodules submodule.subname.ignore dirty &&
+ git config -f .gitmodules submodule.sub.ignore dirty &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual4 &&
test_must_be_empty actual4 &&
- git config submodule.subname.ignore none &&
- git config submodule.subname.path sub &&
+ git config submodule.sub.ignore none &&
+ git config submodule.sub.path sub &&
git diff HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
- git config --remove-section submodule.subname &&
- git config --remove-section -f .gitmodules submodule.subname &&
+ git config --unset submodule.sub.ignore &&
git config --unset diff.ignoreSubmodules &&
git reset --hard pristine-gitmodules
'
@@ -194,27 +191,24 @@ test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)'
'
test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
- git config --add -f .gitmodules submodule.subname.ignore all &&
- git config --add -f .gitmodules submodule.subname.path sub &&
+ git config --add -f .gitmodules submodule.sub.ignore all &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual2 &&
test_must_be_empty actual2 &&
- git config -f .gitmodules submodule.subname.ignore untracked &&
+ git config -f .gitmodules submodule.sub.ignore untracked &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual3 &&
test_must_be_empty actual3 &&
- git config -f .gitmodules submodule.subname.ignore dirty &&
+ git config -f .gitmodules submodule.sub.ignore dirty &&
git commit -m "Update .gitmodules" .gitmodules &&
git diff HEAD >actual4 &&
test_must_be_empty actual4 &&
- git config submodule.subname.ignore none &&
- git config submodule.subname.path sub &&
+ git config submodule.sub.ignore none &&
git diff HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subprev $subprev-dirty &&
test_cmp expect.body actual.body &&
- git config --remove-section submodule.subname &&
- git config --remove-section -f .gitmodules submodule.subname &&
+ git config --unset submodule.sub.ignore &&
git reset --hard pristine-gitmodules
'
@@ -236,22 +230,19 @@ test_expect_success 'git diff between submodule commits [.gitmodules]' '
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subtip $subprev &&
test_cmp expect.body actual.body &&
- git config --add -f .gitmodules submodule.subname.ignore dirty &&
- git config --add -f .gitmodules submodule.subname.path sub &&
+ git config --add -f .gitmodules submodule.sub.ignore dirty &&
git diff HEAD^..HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subtip $subprev &&
test_cmp expect.body actual.body &&
- git config -f .gitmodules submodule.subname.ignore all &&
+ git config -f .gitmodules submodule.sub.ignore all &&
git diff HEAD^..HEAD >actual &&
test_must_be_empty actual &&
- git config submodule.subname.ignore dirty &&
- git config submodule.subname.path sub &&
+ git config submodule.sub.ignore dirty &&
git diff HEAD^..HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
expect_from_to >expect.body $subtip $subprev &&
- git config --remove-section submodule.subname &&
- git config --remove-section -f .gitmodules submodule.subname &&
+ git config --unset submodule.sub.ignore &&
git reset --hard pristine-gitmodules
'
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index 5808339997..3d934bfb86 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1154,8 +1154,7 @@ test_expect_success '.gitmodules ignore=untracked suppresses submodules with unt
test_config diff.ignoreSubmodules dirty &&
git status >output &&
test_cmp expect output &&
- git config --add -f .gitmodules submodule.subname.ignore untracked &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore untracked &&
cat > expect-modified-gitmodules << EOF &&
On branch main
Your branch and '\''upstream'\'' have diverged,
@@ -1187,18 +1186,16 @@ Untracked files:
EOF
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '.git/config ignore=untracked suppresses submodules with untracked content' '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore untracked &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore untracked &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config --remove-section -f .gitmodules submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '--ignore-submodules=dirty suppresses submodules with untracked content' '
@@ -1210,22 +1207,19 @@ test_expect_success '.gitmodules ignore=dirty suppresses submodules with untrack
test_config diff.ignoreSubmodules dirty &&
git status >output &&
! test -s actual &&
- git config --add -f .gitmodules submodule.subname.ignore dirty &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '.git/config ignore=dirty suppresses submodules with untracked content' '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore dirty &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '--ignore-submodules=dirty suppresses submodules with modified content' '
@@ -1235,22 +1229,19 @@ test_expect_success '--ignore-submodules=dirty suppresses submodules with modifi
'
test_expect_success '.gitmodules ignore=dirty suppresses submodules with modified content' '
- git config --add -f .gitmodules submodule.subname.ignore dirty &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '.git/config ignore=dirty suppresses submodules with modified content' '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore dirty &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success "--ignore-submodules=untracked doesn't suppress submodules with modified content" '
@@ -1289,8 +1280,7 @@ EOF
'
test_expect_success ".gitmodules ignore=untracked doesn't suppress submodules with modified content" '
- git config --add -f .gitmodules submodule.subname.ignore untracked &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore untracked &&
cat > expect-modified-gitmodules << EOF &&
On branch main
Your branch and '\''upstream'\'' have diverged,
@@ -1324,18 +1314,16 @@ Untracked files:
EOF
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success ".git/config ignore=untracked doesn't suppress submodules with modified content" '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore untracked &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore untracked &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
head2=$(cd sm && git commit -q -m "2nd commit" foo && git rev-parse --short=7 --verify HEAD)
@@ -1415,22 +1403,19 @@ Untracked files:
untracked
EOF
- git config --add -f .gitmodules submodule.subname.ignore untracked &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore untracked &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success ".git/config ignore=untracked doesn't suppress submodule summary" '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore untracked &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore untracked &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summary" '
@@ -1438,22 +1423,19 @@ test_expect_success "--ignore-submodules=dirty doesn't suppress submodule summar
test_cmp expect output
'
test_expect_success ".gitmodules ignore=dirty doesn't suppress submodule summary" '
- git config --add -f .gitmodules submodule.subname.ignore dirty &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary" '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore dirty &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore dirty &&
git status >output &&
test_cmp expect-modified-gitmodules output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
cat > expect << EOF
@@ -1552,22 +1534,19 @@ Untracked files:
untracked
EOF
- git config --add -f .gitmodules submodule.subname.ignore all &&
- git config --add -f .gitmodules submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore all &&
git status > output &&
test_cmp expect output &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success '.git/config ignore=all suppresses unstaged submodule summary' '
- git config --add -f .gitmodules submodule.subname.ignore none &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore all &&
- git config --add submodule.subname.path sm &&
+ git config --add -f .gitmodules submodule.sm.ignore none &&
+ git config --add submodule.sm.ignore all &&
git status > output &&
test_cmp expect output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success 'setup of test environment' '
@@ -1633,9 +1612,8 @@ test_expect_success 'Restore default test environment' '
'
test_expect_success 'git commit will commit a staged but ignored submodule' '
- git config --add -f .gitmodules submodule.subname.ignore all &&
- git config --add -f .gitmodules submodule.subname.path sm &&
- git config --add submodule.subname.ignore all &&
+ git config --add -f .gitmodules submodule.sm.ignore all &&
+ git config --add submodule.sm.ignore all &&
git status -s --ignore-submodules=dirty >output &&
test_i18ngrep "^M. sm" output &&
GIT_EDITOR="echo hello >>\"\$1\"" &&
@@ -1676,8 +1654,8 @@ test_expect_success 'git commit -m will commit a staged but ignored submodule' '
git commit -uno -m message &&
git status -s --ignore-submodules=dirty >output &&
test_i18ngrep ! "^M. sm" output &&
- git config --remove-section submodule.subname &&
- git config -f .gitmodules --remove-section submodule.subname
+ git config --unset submodule.sm.ignore &&
+ git config -f .gitmodules --unset submodule.sm.ignore
'
test_expect_success 'show stash info with "--show-stash"' '
--
2.39.2.722.g9855ee24e9-goog
next prev parent reply other threads:[~2023-02-28 18:57 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-13 18:21 [RFC PATCH 0/6] add: block invalid submodules Calvin Wan
2023-02-13 18:21 ` [RFC PATCH 1/6] leak fix: cache_put_path Calvin Wan
2023-02-13 19:23 ` Junio C Hamano
2023-02-14 19:56 ` Calvin Wan
2023-02-14 21:08 ` Junio C Hamano
2023-02-14 21:39 ` Calvin Wan
2023-02-14 21:59 ` Junio C Hamano
2023-02-13 18:21 ` [RFC PATCH 2/6] t4041, t4060: modernize test style Calvin Wan
2023-02-13 19:41 ` Junio C Hamano
2023-02-14 20:22 ` Calvin Wan
2023-02-13 18:21 ` [RFC PATCH 3/6] tests: Use `git submodule add` instead of `git add` Calvin Wan
2023-02-13 18:21 ` [RFC PATCH 4/6] tests: use `git submodule add` and fix expected diffs Calvin Wan
2023-02-13 23:07 ` Junio C Hamano
2023-02-13 23:19 ` Junio C Hamano
2023-02-13 18:21 ` [RFC PATCH 5/6] tests: use `git submodule add` and fix expected status Calvin Wan
2023-02-13 18:21 ` [RFC PATCH 6/6] add: reject nested repositories Calvin Wan
2023-02-13 20:42 ` Jeff King
2023-02-14 2:17 ` Junio C Hamano
2023-02-14 16:07 ` Jeff King
2023-02-14 16:32 ` Junio C Hamano
2023-02-14 21:45 ` Calvin Wan
2023-02-28 18:52 ` [PATCH v2 0/6] add: block invalid submodules Calvin Wan
2023-02-28 18:56 ` [PATCH v2 1/6] t4041, t4060: modernize test style Calvin Wan
2023-03-06 19:32 ` Glen Choo
2023-03-06 20:40 ` Calvin Wan
2023-02-28 18:56 ` [PATCH v2 2/6] tests: Use `git submodule add` instead of `git add` Calvin Wan
2023-02-28 23:30 ` Junio C Hamano
2023-03-03 0:16 ` Calvin Wan
2023-03-06 21:26 ` Glen Choo
2023-02-28 18:56 ` [PATCH v2 3/6] tests: use `git submodule add` and fix expected diffs Calvin Wan
2023-03-06 23:34 ` Glen Choo
2023-03-06 23:57 ` Junio C Hamano
2023-02-28 18:56 ` [PATCH v2 4/6] tests: use `git submodule add` and fix expected status Calvin Wan
2023-03-07 0:15 ` Glen Choo
2023-02-28 18:56 ` Calvin Wan [this message]
2023-02-28 23:35 ` [PATCH v2 5/6] tests: remove duplicate .gitmodules path Junio C Hamano
2023-03-02 23:09 ` Calvin Wan
2023-03-07 0:51 ` Glen Choo
2023-02-28 18:56 ` [PATCH v2 6/6] add: reject nested repositories Calvin Wan
2023-03-07 2:04 ` Glen Choo
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=20230228185642.2357806-5-calvinwan@google.com \
--to=calvinwan@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=steadmon@google.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).