tests: use --git-dir instead of -C for bare repos

Replace `git -C <bare>` with `git --git-dir=<bare>` (367 matches, 73 files).

Mechanical verification (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: --git-dir=X -> -C X
        if (match(new, /--git-dir=([^ ]*)/, a)) gsub(/--git-dir=[^ ]*/, "-C " a[1], new)
        if (old[n++] != new) print old[n-1] " != " new
      }'

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

Author: dscho

t/lib-diff-alternative.sh

@@ -131,14 +131,14 @@ EOF
 	'
 
 	test_expect_success "diff from attributes with bare repo with source" '
-		git -C bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
+		git --git-dir=bare.git --attr-source=branchA -c diff.driver.algorithm=myers \
 			-c diff.driverA.algorithm=$STRATEGY \
 			diff HEAD:file1 HEAD:file2 >output &&
 		test_cmp expect output
 	'
 
 	test_expect_success "diff from attributes with bare repo with invalid source" '
-		test_must_fail git -C bare.git --attr-source=invalid-branch diff \
+		test_must_fail git --git-dir=bare.git --attr-source=invalid-branch diff \
 			HEAD:file1 HEAD:file2
 	'
 

t/lib-proto-disable.sh

@@ -83,19 +83,19 @@ test_config () {
 	'
 
 	test_expect_success "fetch $desc (enabled)" '
-		git -C tmp.git -c protocol.$proto.allow=always fetch
+		git --git-dir=tmp.git -c protocol.$proto.allow=always fetch
 	'
 
 	test_expect_success "push $desc (enabled)" '
-		git -C tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
+		git --git-dir=tmp.git -c protocol.$proto.allow=always  push origin HEAD:pushed
 	'
 
 	test_expect_success "push $desc (disabled)" '
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
+		test_must_fail git --git-dir=tmp.git -c protocol.$proto.allow=never push origin HEAD:pushed
 	'
 
 	test_expect_success "fetch $desc (disabled)" '
-		test_must_fail git -C tmp.git -c protocol.$proto.allow=never fetch
+		test_must_fail git --git-dir=tmp.git -c protocol.$proto.allow=never fetch
 	'
 
 	test_expect_success "clone $desc (disabled)" '
@@ -110,11 +110,11 @@ test_config () {
 	'
 
 	test_expect_success "fetch $desc (enabled)" '
-		git -C tmp.git -c protocol.$proto.allow=user fetch
+		git --git-dir=tmp.git -c protocol.$proto.allow=user fetch
 	'
 
 	test_expect_success "push $desc (enabled)" '
-		git -C tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
+		git --git-dir=tmp.git -c protocol.$proto.allow=user push origin HEAD:pushed
 	'
 
 	test_expect_success "push $desc (disabled)" '
@@ -153,22 +153,22 @@ test_config () {
 
 	test_expect_success "fetch $desc (enabled)" '
 		test_config_global protocol.allow always &&
-		git -C tmp.git fetch
+		git --git-dir=tmp.git fetch
 	'
 
 	test_expect_success "push $desc (enabled)" '
 		test_config_global protocol.allow always &&
-		git -C tmp.git push origin HEAD:pushed
+		git --git-dir=tmp.git push origin HEAD:pushed
 	'
 
 	test_expect_success "push $desc (disabled)" '
 		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git push origin HEAD:pushed
+		test_must_fail git --git-dir=tmp.git push origin HEAD:pushed
 	'
 
 	test_expect_success "fetch $desc (disabled)" '
 		test_config_global protocol.allow never &&
-		test_must_fail git -C tmp.git fetch
+		test_must_fail git --git-dir=tmp.git fetch
 	'
 
 	test_expect_success "clone $desc (disabled)" '

t/t0003-attributes.sh

@@ -401,11 +401,11 @@ test_expect_success 'bare repo no longer defaults to reading .gitattributes from
 	git clone --bare test bare_with_gitattribute &&
 
 	echo "f/path: test: unspecified" >expect &&
-	git -C bare_with_gitattribute check-attr test -- f/path >actual &&
+	git --git-dir=bare_with_gitattribute check-attr test -- f/path >actual &&
 	test_cmp expect actual &&
 
 	echo "f/path: test: val" >expect &&
-	git -C bare_with_gitattribute -c attr.tree=HEAD \
+	git --git-dir=bare_with_gitattribute -c attr.tree=HEAD \
 		check-attr test -- f/path >actual &&
 	test_cmp expect actual
 '

t/t0410-partial-clone.sh

@@ -643,10 +643,10 @@ test_expect_success 'exact rename does not need to fetch the blob lazily' '
 	test_config -C repo uploadpack.allowanysha1inwant 1 &&
 
 	git clone --filter=blob:none --bare "file://$(pwd)/repo" partial.git &&
-	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	git --git-dir=partial.git rev-list --objects --missing=print HEAD >out &&
 	grep "[?]$FILE_HASH" out &&
-	git -C partial.git log --follow -- new-file.txt &&
-	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	git --git-dir=partial.git log --follow -- new-file.txt &&
+	git --git-dir=partial.git rev-list --objects --missing=print HEAD >out &&
 	grep "[?]$FILE_HASH" out
 '
 
@@ -661,30 +661,30 @@ test_expect_success 'lazy-fetch when accessing object not in the_repository' '
 	FILE_HASH=$(git -C full rev-parse HEAD:file.txt) &&
 
 	# Sanity check that the file is missing
-	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	git --git-dir=partial.git rev-list --objects --missing=print HEAD >out &&
 	grep "[?]$FILE_HASH" out &&
 
 	# The no-lazy-fetch mechanism prevents Git from fetching
 	test_must_fail env GIT_NO_LAZY_FETCH=1 \
-		git -C partial.git cat-file -e "$FILE_HASH" &&
+		git --git-dir=partial.git cat-file -e "$FILE_HASH" &&
 
 	# The same with command line option to "git"
-	test_must_fail git --no-lazy-fetch -C partial.git cat-file -e "$FILE_HASH" &&
+	test_must_fail git --no-lazy-fetch --git-dir=partial.git cat-file -e "$FILE_HASH" &&
 
 	# The same, forcing a subprocess via an alias
-	test_must_fail git --no-lazy-fetch -C partial.git \
+	test_must_fail git --no-lazy-fetch --git-dir=partial.git \
 		-c alias.foo="!git cat-file" foo -e "$FILE_HASH" &&
 
 	# Sanity check that the file is still missing
-	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	git --git-dir=partial.git rev-list --objects --missing=print HEAD >out &&
 	grep "[?]$FILE_HASH" out &&
 
 	git -C full cat-file -s "$FILE_HASH" >expect &&
 	test-tool partial-clone object-info partial.git "$FILE_HASH" >actual &&
 	test_cmp expect actual &&
 
 	# Sanity check that the file is now present
-	git -C partial.git rev-list --objects --missing=print HEAD >out &&
+	git --git-dir=partial.git rev-list --objects --missing=print HEAD >out &&
 	! grep "[?]$FILE_HASH" out
 '
 

t/t0600-reffiles-backend.sh

@@ -428,14 +428,14 @@ test_expect_success SYMLINKS 'git branch -m with symlinked .git/refs' '
 	ln -s ../.git/objects subdir/objects &&
 	ln -s ../.git/packed-refs subdir/packed-refs &&
 
-	git -C subdir rev-parse --absolute-git-dir >subdir.dir &&
+	git --git-dir=subdir rev-parse --absolute-git-dir >subdir.dir &&
 	git rev-parse --absolute-git-dir >our.dir &&
 	! test_cmp subdir.dir our.dir &&
 
-	git -C subdir log &&
-	git -C subdir branch rename-src &&
+	git --git-dir=subdir log &&
+	git --git-dir=subdir branch rename-src &&
 	git rev-parse rename-src >expect &&
-	git -C subdir branch -m rename-src rename-dest &&
+	git --git-dir=subdir branch -m rename-src rename-dest &&
 	git rev-parse rename-dest >actual &&
 	test_cmp expect actual &&
 	git branch -D rename-dest

t/t1022-read-tree-partial-clone.sh

@@ -18,7 +18,7 @@ test_expect_success 'read-tree in partial clone prefetches in one batch' '
 	git -C server config uploadpack.allowfilter 1 &&
 	git -C server config uploadpack.allowanysha1inwant 1 &&
 	git clone --bare --filter=blob:none "file://$(pwd)/server" client &&
-	GIT_TRACE_PACKET="$(pwd)/trace" git -C client read-tree $TREE $TREE &&
+	GIT_TRACE_PACKET="$(pwd)/trace" git --git-dir=client read-tree $TREE $TREE &&
 
 	# "done" marks the end of negotiation (once per fetch). Expect that
 	# only one fetch occurs.

t/t1050-large.sh

@@ -28,8 +28,8 @@ test_expect_success 'enter "large" codepath, with small core.bigFileThreshold' '
 	test_when_finished "rm -rf repo" &&
 
 	git init --bare repo &&
-	echo large | git -C repo hash-object -w --stdin &&
-	git -C repo -c core.bigfilethreshold=4 fsck
+	echo large | git --git-dir=repo hash-object -w --stdin &&
+	git --git-dir=repo -c core.bigfilethreshold=4 fsck
 '
 
 # add a large file with different settings

t/t1091-sparse-checkout-builtin.sh

@@ -951,32 +951,32 @@ test_expect_success 'setup bare repo' '
 	git clone --bare "file://$(pwd)/repo" bare
 '
 test_expect_success 'list fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout list 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout list 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
 test_expect_success 'add fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout add deeper 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout add deeper 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
 test_expect_success 'set fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout set deeper 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout set deeper 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
 test_expect_success 'init fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout init 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout init 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
 test_expect_success 'reapply fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout reapply 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout reapply 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
 test_expect_success 'disable fails outside work tree' '
-	test_must_fail git -C bare sparse-checkout disable 2>err &&
+	test_must_fail git --git-dir=bare sparse-checkout disable 2>err &&
 	test_grep "this operation must be run in a work tree" err
 '
 
@@ -990,7 +990,7 @@ test_expect_success 'check-rules cone mode' '
 	deep/deeper1/deepest
 	EOF
 
-	git -C bare ls-tree -r --name-only HEAD >all-files &&
+	git --git-dir=bare ls-tree -r --name-only HEAD >all-files &&
 	git --git-dir=bare sparse-checkout check-rules --cone \
 		--rules-file rules >check-rules-file <all-files &&
 
@@ -1012,7 +1012,7 @@ test_expect_success 'check-rules non-cone mode' '
 	deep/deeper1/deepest/a
 	EOF
 
-	git -C bare ls-tree -r --name-only HEAD >all-files &&
+	git --git-dir=bare ls-tree -r --name-only HEAD >all-files &&
 	git --git-dir=bare sparse-checkout check-rules --no-cone --rules-file rules\
 		>check-rules-file <all-files &&
 

t/t1305-config-include.sh

@@ -350,9 +350,9 @@ test_expect_success 'conditional include, onbranch, implicit /** for /' '
 
 test_expect_success 'include cycles are detected' '
 	git init --bare cycle &&
-	git -C cycle config include.path cycle &&
+	git --git-dir=cycle config include.path cycle &&
 	git config -f cycle/cycle include.path config &&
-	test_must_fail git -C cycle config --get-all test.value 2>stderr &&
+	test_must_fail git --git-dir=cycle config --get-all test.value 2>stderr &&
 	grep "exceeded maximum include depth" stderr
 '
 

t/t1400-update-ref.sh

@@ -124,22 +124,22 @@ test_expect_success 'update-ref creates reflogs with --create-reflog' '
 '
 
 test_expect_success 'creates no reflog in bare repository' '
-	git -C $bare update-ref $m $bareA &&
-	git -C $bare rev-parse $bareA >expect &&
-	git -C $bare rev-parse $m >actual &&
+	git --git-dir=$bare update-ref $m $bareA &&
+	git --git-dir=$bare rev-parse $bareA >expect &&
+	git --git-dir=$bare rev-parse $m >actual &&
 	test_cmp expect actual &&
-	test_must_fail git -C $bare reflog exists $m
+	test_must_fail git --git-dir=$bare reflog exists $m
 '
 
 test_expect_success 'core.logAllRefUpdates=true creates reflog in bare repository' '
-	test_when_finished "git -C $bare config --unset core.logAllRefUpdates && \
+	test_when_finished "git --git-dir=$bare config --unset core.logAllRefUpdates && \
 		test-tool ref-store main delete-reflog $m" &&
-	git -C $bare config core.logAllRefUpdates true &&
-	git -C $bare update-ref $m $bareB &&
-	git -C $bare rev-parse $bareB >expect &&
-	git -C $bare rev-parse $m >actual &&
+	git --git-dir=$bare config core.logAllRefUpdates true &&
+	git --git-dir=$bare update-ref $m $bareB &&
+	git --git-dir=$bare rev-parse $bareB >expect &&
+	git --git-dir=$bare rev-parse $m >actual &&
 	test_cmp expect actual &&
-	git -C $bare reflog exists $m
+	git --git-dir=$bare reflog exists $m
 '
 
 test_expect_success 'core.logAllRefUpdates=true does not create reflog by default' '