From: Shourya Shukla <periperidip@gmail.com>
To: git@vger.kernel.org
Cc: gitster@pobox.com, christian.couder@gmail.com,
levraiphilippeblain@gmail.com,
Shourya Shukla <periperidip@gmail.com>
Subject: [PATCH 2/2] t3600: amend test 46 to check for '.gitmodules' modification
Date: Fri, 19 Feb 2021 00:19:31 +0530 [thread overview]
Message-ID: <20210218184931.83613-3-periperidip@gmail.com> (raw)
In-Reply-To: <20210218184931.83613-1-periperidip@gmail.com>
Following commit e5a439dc71 (rm: changes in the '.gitmodules' are
staged after using '--cached', 2021-02-18), amend test 46 of the script
to ensure that the test also checks for '.gitmodules' modification after
a 'git rm --cached <submodule>' i.e., the entry of the submodule in
question is removed from the file.
Signed-off-by: Shourya Shukla <periperidip@gmail.com>
---
t/t3600-rm.sh | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index 7547f11a5c..45aff97b90 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -309,6 +309,7 @@ cat >expect.modified_untracked <<EOF
EOF
cat >expect.cached <<EOF
+M .gitmodules
D submod
EOF
@@ -390,16 +391,14 @@ test_expect_success 'rm of a populated submodule with different HEAD fails unles
test_must_fail git config -f .gitmodules submodule.sub.path
'
-test_expect_success 'rm --cached leaves work tree of populated submodules and .gitmodules alone' '
+test_expect_success 'rm --cached leaves work tree of populated submodules alone' '
git reset --hard &&
git submodule update &&
git rm --cached submod &&
test_path_is_dir submod &&
test_path_is_file submod/.git &&
git status -s -uno >actual &&
- test_cmp expect.cached actual &&
- git config -f .gitmodules submodule.sub.url &&
- git config -f .gitmodules submodule.sub.path
+ test_cmp expect.cached actual
'
test_expect_success 'rm --dry-run does not touch the submodule or .gitmodules' '
--
2.25.1
next prev parent reply other threads:[~2021-02-18 18:56 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 18:49 [RFC][PATCH 0/2] rm: changes in the '.gitmodules' are staged after using '--cached' Shourya Shukla
2021-02-18 18:49 ` [PATCH 1/2] " Shourya Shukla
2021-02-18 20:14 ` Philippe Blain
2021-02-18 20:39 ` Philippe Blain
2021-02-19 15:19 ` Shourya Shukla
2021-02-18 22:03 ` Junio C Hamano
2021-02-19 15:24 ` Shourya Shukla
2021-02-20 3:31 ` Junio C Hamano
2021-02-18 18:49 ` Shourya Shukla [this message]
2021-02-18 20:21 ` [PATCH 2/2] t3600: amend test 46 to check for '.gitmodules' modification Philippe Blain
2021-02-22 17:26 ` [PATCH v2 0/1] rm: stage submodule removal from '.gitmodules' Shourya Shukla
2021-02-22 17:26 ` [PATCH v2 1/1] rm: stage submodule removal from '.gitmodules' when using '--cached' Shourya Shukla
2021-02-22 18:58 ` Junio C Hamano
2021-03-05 17:58 ` Shourya Shukla
2021-03-05 21:39 ` Junio C Hamano
2021-02-22 19:29 ` Junio C Hamano
2021-03-07 16:46 ` Shourya Shukla
2021-03-07 20:29 ` Junio C Hamano
2021-03-09 7:13 ` Shourya Shukla
2021-03-09 20:47 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210218184931.83613-3-periperidip@gmail.com \
--to=periperidip@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=levraiphilippeblain@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).