t7103, t9903: export GIT_CONFIG_PARAMETERS in .git directory tests

The default of the `safe.bareRepository` will change at some stage, at
which time bare repositories won't be discovered implicitly in general
anymore.

When `git reset` is called with an explicit gitdir (e.g. by using the
`--git-dir` option), it behaves differently from an implicit gitdir,
though: In the former case, it trusts the user to know what they are
doing, in the latter case it will refuse certain modes because they
require a worktree. For that reason, we have to adjust the test cases
that verify this behavior not by specifying the gitdir explicitly, but
instead enforcing implicit gitdir discovery.

The test cases that want to verify that the Git prompt shows
`(GIT_DIR!)` when a gitdir was discovered implicitly _also_ need the
same treatment.

Mechanical verification of the code changes can be performed via this
here command-line (the awk script undoes the transformation on the new
lines; empty output is success):

    git diff HEAD^! | awk '
      /^diff/,/^\+\+\+/ { next }
      /^-/ { old[m++] = substr($0,2) }
      /^\+/ {
        new = substr($0,2)
        # undo: strip GIT_CONFIG_PARAMETERS and export
        gcp="GIT_CONFIG_PARAMETERS"
        gsub(" " gcp "=[^ ]* && export " gcp " &&", "", new)
        if (old[n++] != new) print old[n-1] " != " new
      }'

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>

Author: dscho

t/t7103-reset-bare.sh

@@ -13,26 +13,26 @@ test_expect_success 'setup non-bare' '
 '
 
 test_expect_success '"hard" reset requires a worktree' '
-	(cd .git &&
+	(cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 	 test_must_fail git reset --hard)
 '
 
 test_expect_success '"merge" reset requires a worktree' '
-	(cd .git &&
+	(cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 	 test_must_fail git reset --merge)
 '
 
 test_expect_success '"keep" reset requires a worktree' '
-	(cd .git &&
+	(cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 	 test_must_fail git reset --keep)
 '
 
 test_expect_success '"mixed" reset is ok' '
-	(cd .git && git reset)
+	(cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS && git reset)
 '
 
 test_expect_success '"soft" reset is ok' '
-	(cd .git && git reset --soft)
+	(cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS && git reset --soft)
 '
 
 test_expect_success 'hard reset works with GIT_WORK_TREE' '

t/t9903-bash-prompt.sh

@@ -135,7 +135,7 @@ test_expect_success 'prompt - describe detached head - default' '
 test_expect_success 'prompt - inside .git directory' '
 	printf " (GIT_DIR!)" >expected &&
 	(
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -155,7 +155,7 @@ test_expect_success 'prompt - inside bare repository' '
 	git init --bare bare.git &&
 	test_when_finished "rm -rf bare.git" &&
 	(
-		cd bare.git &&
+		cd bare.git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -374,7 +374,7 @@ test_expect_success 'prompt - dirty status indicator - not shown inside .git dir
 	test_when_finished "git reset --hard" &&
 	(
 		GIT_PS1_SHOWDIRTYSTATE=y &&
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -409,7 +409,7 @@ test_expect_success 'prompt - stash status indicator - not shown inside .git dir
 	test_when_finished "git stash drop" &&
 	(
 		GIT_PS1_SHOWSTASHSTATE=y &&
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -514,7 +514,7 @@ test_expect_success 'prompt - untracked files status indicator - not shown insid
 	printf " (GIT_DIR!)" >expected &&
 	(
 		GIT_PS1_SHOWUNTRACKEDFILES=y &&
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"
@@ -619,7 +619,7 @@ test_expect_success 'prompt - bash color pc mode - inside .git directory' '
 	(
 		GIT_PS1_SHOWDIRTYSTATE=y &&
 		GIT_PS1_SHOWCOLORHINTS=y &&
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 "BEFORE:" ":AFTER" &&
 		printf "%s\\n%s" "$PS1" "${__git_ps1_branch_name}" >"$actual"
 	) &&
@@ -749,7 +749,7 @@ test_expect_success 'prompt - hide if pwd ignored - inside gitdir' '
 	printf " (GIT_DIR!)" >expected &&
 	(
 		GIT_PS1_HIDE_IF_PWD_IGNORED=y &&
-		cd .git &&
+		cd .git && GIT_CONFIG_PARAMETERS="${SQ}safe.bareRepository=all${SQ}" && export GIT_CONFIG_PARAMETERS &&
 		__git_ps1 >"$actual"
 	) &&
 	test_cmp expected "$actual"