[RFC 07/10] FIXME: wrap-for-bin.sh: set 'core.submodulesFile' for each git invocation
- From
Antonio Ospite <ao2@ao2.it>
- Date
- Apr 13, 2018, 08:07 UTC
- Message-ID
- <20180413080733.6380-1-ao2@ao2.it>
- In-Reply-To
- <20180412222047.5716-1-ao2@ao2.it>
This is to test custom gitmodules file paths. The default path can be overridden using the 'GIT_MODULES_FILE' environmental variable.
Maybe In the final patch the option should be set only when running tests and not unconditionally in the wrapper script, but as a proof of concept the wrapper script was a convenient location.
Also, in the final patch a fixed custom file path could be used instead of the environmental variable: to exercise the code it should be enough to have a value different from the default one.
The change to 't0001-init.sh' is needed to make the test pass, since now a config is set on the command line. --- Makefile | 3 ++- t/t0001-init.sh | 1 + wrap-for-bin.sh | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 wrap-for-bin.sh
diff --git a/Makefile b/Makefile index f18168725..38ee1f6a2 100644 --- a/Makefile +++ b/Makefile @@ -2480,7 +2480,8 @@ bin-wrappers/%: wrap-for-bin.sh @mkdir -p bin-wrappers $(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@@BUILD_DIR@@|$(shell pwd)|' \ - -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \ + -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' \ + -e 's|git\"|git\" $$GIT_OPTIONS|' < $< > $@ && \ chmod +x $@ # GNU make supports exporting all variables by "export" without parameters. diff --git a/t/t0001-init.sh b/t/t0001-init.sh index c413bff9c..6fa3fd24e 100755 --- a/t/t0001-init.sh +++ b/t/t0001-init.sh @@ -93,6 +93,7 @@ test_expect_success 'No extra GIT_* on alias scripts' ' sed -n \ -e "/^GIT_PREFIX=/d" \ -e "/^GIT_TEXTDOMAINDIR=/d" \ + -e "/^GIT_CONFIG_PARAMETERS=/d" \ -e "/^GIT_/s/=.*//p" | sort EOF diff --git a/wrap-for-bin.sh b/wrap-for-bin.sh old mode 100644 new mode 100755 index 584240881..02bf41cbd --- a/wrap-for-bin.sh +++ b/wrap-for-bin.sh @@ -20,6 +20,8 @@ PATH='@@BUILD_DIR@@/bin-wrappers:'"$PATH" export GIT_EXEC_PATH GITPERLLIB PATH GIT_TEXTDOMAINDIR +GIT_OPTIONS="-c core.submodulesfile=${GITMODULES_FILE:-.gitmodules}" + if test -n "$GIT_TEST_GDB" then unset GIT_TEST_GDB
-- 2.17.0