From: Antonio Ospite <ao2@ao2.it>
To: git@vger.kernel.org
Cc: Richard Hartmann <richih.mailinglist@gmail.com>,
Antonio Ospite <ao2@ao2.it>
Subject: [RFC 08/10] FIXME: submodule: fix t1300-repo-config.sh to take into account the new config
Date: Fri, 13 Apr 2018 10:07:31 +0200 [thread overview]
Message-ID: <20180413080733.6380-2-ao2@ao2.it> (raw)
In-Reply-To: <20180413080733.6380-1-ao2@ao2.it>
Tests are run with the 'core.submodulesfile' config set, so
't/t1300-repo-config.sh' needs to be fixed to account for that.
The changes to the HEREDOC lines are temporary and only needed to
support the environmental variable expansion, they could go away
eventually is using a fixed value is good enough.
---
t/t1300-repo-config.sh | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index e95b1e67d..f672a6c37 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -338,6 +338,7 @@ beta.noindent=sillyValue
nextsection.nonewline=wow2 for me
123456.a123=987
version.1.2.3eX.alpha=beta
+core.submodulesfile=${GITMODULES_FILE:-.gitmodules}
EOF
test_expect_success 'working --list' '
@@ -345,6 +346,7 @@ test_expect_success 'working --list' '
test_cmp expect output
'
cat > expect << EOF
+core.submodulesfile=${GITMODULES_FILE:-.gitmodules}
EOF
test_expect_success '--list without repo produces empty output' '
@@ -357,6 +359,7 @@ beta.noindent
nextsection.nonewline
123456.a123
version.1.2.3eX.alpha
+core.submodulesfile
EOF
test_expect_success '--name-only --list' '
@@ -964,10 +967,11 @@ inued
inued"
EOF
-cat > expect <<\EOF
+cat > expect << EOF
section.continued=continued
section.noncont=not continued
section.quotecont=cont;inued
+core.submodulesfile=${GITMODULES_FILE:-.gitmodules}
EOF
test_expect_success 'value continued on next line' '
@@ -984,7 +988,7 @@ cat > .git/config <<\EOF
val5
EOF
-cat > expect <<\EOF
+cat > expect << EOF
section.sub=section.val1
foo=barQsection.sub=section.val2
foo
@@ -992,7 +996,8 @@ barQsection.sub=section.val3
Qsection.sub=section.val4
-Qsection.sub=section.val5Q
+Qsection.sub=section.val5Qcore.submodulesfile
+${GITMODULES_FILE:-.gitmodules}Q
EOF
test_expect_success '--null --list' '
git config --null --list >result.raw &&
@@ -1001,6 +1006,17 @@ test_expect_success '--null --list' '
test_cmp expect result
'
+cat > expect << EOF
+section.sub=section.val1
+foo=barQsection.sub=section.val2
+foo
+barQsection.sub=section.val3
+
+
+Qsection.sub=section.val4
+Qsection.sub=section.val5Q
+EOF
+
test_expect_success '--null --get-regexp' '
git config --null --get-regexp "val[0-9]" >result.raw &&
nul_to_q <result.raw >result &&
@@ -1495,6 +1511,7 @@ test_expect_success '--show-origin with --list' '
file:.git/config user.override=local
file:.git/config include.path=../include/relative.include
file:.git/../include/relative.include user.relative=include
+ command line: core.submodulesfile=${GITMODULES_FILE:-.gitmodules}
command line: user.cmdline=true
EOF
git -c user.cmdline=true config --list --show-origin >output &&
@@ -1511,7 +1528,8 @@ test_expect_success '--show-origin with --list --null' '
trueQfile:.git/configQuser.override
localQfile:.git/configQinclude.path
../include/relative.includeQfile:.git/../include/relative.includeQuser.relative
- includeQcommand line:Quser.cmdline
+ includeQcommand line:Qcore.submodulesfile
+ ${GITMODULES_FILE:-.gitmodules}Qcommand line:Quser.cmdline
trueQ
EOF
git -c user.cmdline=true config --null --list --show-origin >output.raw &&
--
2.17.0
next prev parent reply other threads:[~2018-04-13 8:08 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-12 22:20 [RFC 00/10] Make .the gitmodules file path configurable Antonio Ospite
2018-04-12 22:20 ` [RFC 01/10] submodule: add 'core.submodulesFile' to override the '.gitmodules' path Antonio Ospite
2018-04-12 23:50 ` Stefan Beller
2018-04-16 16:37 ` Antonio Ospite
2018-04-16 21:22 ` Stefan Beller
2018-04-18 11:43 ` Antonio Ospite
2018-04-18 18:44 ` Stefan Beller
2018-04-12 22:20 ` [RFC 02/10] submodule: fix getting custom gitmodule file in fetch command Antonio Ospite
2018-04-12 23:55 ` Stefan Beller
2018-04-16 16:18 ` Antonio Ospite
2018-04-16 19:23 ` Stefan Beller
2018-04-16 20:46 ` Antonio Ospite
2018-04-12 22:20 ` [RFC 03/10] submodule: use the 'submodules_file' variable in output messages Antonio Ospite
2018-04-12 22:20 ` [RFC 04/10] submodule: document 'core.submodulesFile' and fix references to '.gitmodules' Antonio Ospite
2018-04-12 22:20 ` [RFC 05/10] submodule: adjust references to '.gitmodules' in comments Antonio Ospite
2018-04-12 22:20 ` [RFC 06/10] completion: add 'core.submodulesfile' to the git-completion.bash file Antonio Ospite
2018-04-12 23:36 ` [RFC 00/10] Make .the gitmodules file path configurable Stefan Beller
2018-04-16 11:33 ` Antonio Ospite
2018-04-16 19:22 ` Stefan Beller
2018-04-13 8:07 ` Antonio Ospite
2018-04-13 8:07 ` [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation Antonio Ospite
2018-04-13 8:07 ` Antonio Ospite [this message]
2018-04-13 8:07 ` [RFC 09/10] FIXME: submodule: pass custom gitmodules file to 'test-tool submodule-config' Antonio Ospite
2018-04-13 8:07 ` [RFC 10/10] FIXME: add a hacky script to test the changes with a patched test suite Antonio Ospite
2018-04-13 20:05 ` [RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation Stefan Beller
2018-04-16 11:36 ` Antonio Ospite
2018-04-23 17:47 ` [RFC 00/10] Make .the gitmodules file path configurable Jonathan Nieder
2018-04-30 12:51 ` Antonio Ospite
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=20180413080733.6380-2-ao2@ao2.it \
--to=ao2@ao2.it \
--cc=git@vger.kernel.org \
--cc=richih.mailinglist@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).