tests: replace -C to --git-dir, dropping ../ prefixes as needed

An easy way to prepare the tests for a time when the `safe.bareRepository`
default changes is to replaced `-C <dir>` with `--git-dir=<dir>` in those
invocations that concern bare repositories. However, in some cases, further
adjustments are required: since `-C` changes the work directory, relative
paths specified in the Git command have to change, too.

This commit takes care of the `git -C <dir>` invocations that specified
paths in the current directory, via `../<name>` arguments. Naturally, these
arguments now need to drop that `../` prefix.

This commit can be verified mechanically via this awk script that applies the
transformation on the old lines; empty output is success:

    git diff HEAD^! | awk '
      /^diff/,/^\+\+\+/ { next }
      /^-/ {
        line = substr($0,2)
        # apply: -C X -> --git-dir=X and strip ../
        if (match(line, /-C ([^ ]*)/, a)) {
          gsub(/-C [^ ]*/, "--git-dir=" a[1], line)
        }
        gsub(/\.\.\//, "", line)
        old[m++] = line
      }
      /^\+/ { new = substr($0,2); if (old[n++] != new) print old[n-1] " != " new }'

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

Author: dscho

t/t0001-init.sh

@@ -347,7 +347,7 @@ test_expect_success 'bare & --separate-git-dir incompatible within worktree' '
 	test_when_finished "rm -rf bare.git linkwt seprepo" &&
 	test_commit gumby &&
 	git clone --bare . bare.git &&
-	git -C bare.git worktree add --detach ../linkwt &&
+	git --git-dir=bare.git worktree add --detach linkwt &&
 	test_must_fail git -C linkwt init --separate-git-dir seprepo 2>err &&
 	test_grep "incompatible" err
 '

t/t1091-sparse-checkout-builtin.sh

@@ -991,8 +991,8 @@ test_expect_success 'check-rules cone mode' '
 	EOF
 
 	git -C bare ls-tree -r --name-only HEAD >all-files &&
-	git -C bare sparse-checkout check-rules --cone \
-		--rules-file ../rules >check-rules-file <all-files &&
+	git --git-dir=bare sparse-checkout check-rules --cone \
+		--rules-file rules >check-rules-file <all-files &&
 
 	git -C repo sparse-checkout set --cone --stdin <rules&&
 	git -C repo ls-files -t >out &&
@@ -1013,7 +1013,7 @@ test_expect_success 'check-rules non-cone mode' '
 	EOF
 
 	git -C bare ls-tree -r --name-only HEAD >all-files &&
-	git -C bare sparse-checkout check-rules --no-cone --rules-file ../rules\
+	git --git-dir=bare sparse-checkout check-rules --no-cone --rules-file rules\
 		>check-rules-file <all-files &&
 
 	git -C repo sparse-checkout set --no-cone --stdin <rules &&
@@ -1051,8 +1051,8 @@ test_expect_success 'check-rules cone mode is default' '
 	git -C repo sparse-checkout check-rules \
 		--rules-file ../rules >actual <all-files &&
 
-	git -C bare sparse-checkout check-rules \
-		--rules-file ../rules >actual-bare <all-files &&
+	git --git-dir=bare sparse-checkout check-rules \
+		--rules-file rules >actual-bare <all-files &&
 
 	test_cmp expect actual &&
 	test_cmp expect actual-bare

t/t2400-worktree-add.sh

@@ -467,7 +467,7 @@ test_expect_success 'local clone from linked checkout' '
 '
 
 test_expect_success 'local clone --shared from linked checkout' '
-	git -C bare worktree add --detach ../baretree &&
+	git --git-dir=bare worktree add --detach baretree &&
 	git clone --local --shared baretree bare-clone &&
 	grep /bare/ bare-clone/.git/objects/info/alternates
 '
@@ -1132,7 +1132,7 @@ test_expect_success '"add" in bare repo invokes post-checkout hook' '
 		echo $(pwd)/goozy
 	} >hook.expect &&
 	post_checkout_hook --git-dir bare &&
-	git -C bare worktree add --detach ../goozy &&
+	git --git-dir=bare worktree add --detach goozy &&
 	test_cmp hook.expect goozy/hook.actual
 '
 

t/t2402-worktree-list.sh

@@ -211,7 +211,7 @@ test_expect_success 'bare repo setup' '
 
 test_expect_success '"list" all worktrees from bare main' '
 	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
+	git --git-dir=bare1 worktree add --detach there main &&
 	echo "$(pwd)/bare1 (bare)" >expect &&
 	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git -C bare1 worktree list >out &&
@@ -221,7 +221,7 @@ test_expect_success '"list" all worktrees from bare main' '
 
 test_expect_success '"list" all worktrees --porcelain from bare main' '
 	test_when_finished "rm -rf there actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
+	git --git-dir=bare1 worktree add --detach there main &&
 	echo "worktree $(pwd)/bare1" >expect &&
 	echo "bare" >>expect &&
 	echo >>expect &&
@@ -235,7 +235,7 @@ test_expect_success '"list" all worktrees --porcelain from bare main' '
 
 test_expect_success '"list" all worktrees from linked with a bare main' '
 	test_when_finished "rm -rf there out actual expect && git -C bare1 worktree prune" &&
-	git -C bare1 worktree add --detach ../there main &&
+	git --git-dir=bare1 worktree add --detach there main &&
 	echo "$(pwd)/bare1 (bare)" >expect &&
 	echo "$(git -C there rev-parse --show-toplevel) $(git -C there rev-parse --short HEAD) (detached HEAD)" >>expect &&
 	git -C there worktree list >out &&

t/t2406-worktree-repair.sh

@@ -81,7 +81,7 @@ test_expect_success 'repair .git file from linked worktree' '
 test_expect_success 'repair .git file from bare.git' '
 	test_when_finished "rm -rf bare.git corrupt && git worktree prune" &&
 	git clone --bare . bare.git &&
-	git -C bare.git worktree add --detach ../corrupt &&
+	git --git-dir=bare.git worktree add --detach corrupt &&
 	git -C corrupt rev-parse --absolute-git-dir >expect &&
 	rm -f corrupt/.git &&
 	(cd bare.git && GIT_DIR=. && export GIT_DIR &&

t/t3200-branch.sh

@@ -406,7 +406,7 @@ test_expect_success 'bare main worktree has HEAD at branch deleted by secondary
 	git init -b main nonbare &&
 	test_commit -C nonbare x &&
 	git clone --bare nonbare bare &&
-	git -C bare worktree add --detach ../secondary main &&
+	git --git-dir=bare worktree add --detach secondary main &&
 	git -C secondary branch -D main
 '
 
@@ -420,7 +420,7 @@ test_expect_success 'secondary worktrees recognize core.bare=true in main config
 	git -C bare_repo config unset core.bare &&
 	git -C bare_repo config --worktree core.bare true &&
 
-	git -C bare_repo worktree add ../secondary_worktree &&
+	git --git-dir=bare_repo worktree add secondary_worktree &&
 	git -C secondary_worktree checkout main
 '
 

t/t5504-fetch-receive-strict.sh

@@ -372,7 +372,7 @@ test_expect_success PERL_TEST_HELPERS 'badFilemode is not a strict error' '
 	git init --bare dst.git &&
 	git -C dst.git config transfer.fsckObjects true &&
 
-	git -C badmode.git push ../dst.git $tree:refs/tags/tree 2>err &&
+	git --git-dir=badmode.git push dst.git $tree:refs/tags/tree 2>err &&
 	grep "$tree: badFilemode" err
 '
 

t/t5558-clone-bundle-uri.sh

@@ -1035,7 +1035,7 @@ test_expect_success 'expand incremental bundle list' '
 
 		cp bundle-*.bundle "$HTTPD_DOCUMENT_ROOT_PATH/"
 	) &&
-	git -C "$HTTPD_DOCUMENT_ROOT_PATH/fetch.git" fetch origin +refs/heads/*:refs/heads/*
+	git --git-dir="$HTTPD_DOCUMENT_ROOT_PATH/fetch.git" fetch origin +refs/heads/*:refs/heads/*
 '
 
 test_expect_success 'creationToken heuristic with failed downloads (fetch)' '

t/t6020-bundle-misc.sh

@@ -358,11 +358,11 @@ test_expect_success 'fail to verify bundle without prerequisites' '
 	error: <COMMIT-G> Z
 	EOF
 
-	test_must_fail git -C test1.git bundle verify ../2.bdl 2>&1 |
+	test_must_fail git --git-dir=test1.git bundle verify 2.bdl 2>&1 |
 		make_user_friendly_and_stable_output >actual &&
 	test_cmp expect actual &&
 
-	test_must_fail git -C test1.git bundle verify ../stdin-2.bdl 2>&1 |
+	test_must_fail git --git-dir=test1.git bundle verify stdin-2.bdl 2>&1 |
 		make_user_friendly_and_stable_output >actual &&
 	test_cmp expect actual
 '
@@ -460,7 +460,7 @@ test_expect_success 'clone from bundle' '
 	EOF
 	test_cmp expect actual &&
 
-	git -C mirror.git fetch ../2.bdl "+refs/*:refs/*" &&
+	git --git-dir=mirror.git fetch 2.bdl "+refs/*:refs/*" &&
 	git -C mirror.git show-ref |
 		make_user_friendly_and_stable_output >actual &&
 	cat >expect <<-\EOF &&
@@ -470,7 +470,7 @@ test_expect_success 'clone from bundle' '
 	EOF
 	test_cmp expect actual &&
 
-	git -C mirror.git fetch ../3.bdl "+refs/*:refs/*" &&
+	git --git-dir=mirror.git fetch 3.bdl "+refs/*:refs/*" &&
 	git -C mirror.git show-ref |
 		make_user_friendly_and_stable_output >actual &&
 	cat >expect <<-\EOF &&
@@ -481,7 +481,7 @@ test_expect_success 'clone from bundle' '
 	EOF
 	test_cmp expect actual &&
 
-	git -C mirror.git fetch ../4.bdl "+refs/*:refs/*" &&
+	git --git-dir=mirror.git fetch 4.bdl "+refs/*:refs/*" &&
 	git -C mirror.git show-ref |
 		make_user_friendly_and_stable_output >actual &&
 	cat >expect <<-\EOF &&

t/t6500-gc.sh

@@ -203,8 +203,8 @@ test_expect_success 'gc.repackFilterTo store filtered out objects' '
 	test_when_finished "rm -rf bare.git filtered.git" &&
 
 	git init --bare filtered.git &&
-	git -C bare.git -c gc.repackFilter=blob:none \
-		-c gc.repackFilterTo=../filtered.git/objects/pack/pack \
+	git --git-dir=bare.git -c gc.repackFilter=blob:none \
+		-c gc.repackFilterTo=filtered.git/objects/pack/pack \
 		-c repack.writeBitmaps=false -c gc.cruftPacks=false gc &&
 
 	test_stdout_line_count = 1 ls bare.git/objects/pack/*.pack &&