Replace the 'git config' calls in tests with test_config for greater
robustness.
Signed-off-by: Ramkumar Ramachandra <artag...@gmail.com>
---
t/t5516-fetch-push.sh | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh
index 6e9fa84..afb25c4 100755
--- a/t/t5516-fetch-push.sh
+++ b/t/t5516-fetch-push.sh
@@ -142,8 +142,8 @@ test_expect_success 'fetch with wildcard' '
mk_empty testrepo &&
(
cd testrepo &&
- git config remote.up.url .. &&
- git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*"
&&
+ test_config remote.up.url .. &&
+ test_config remote.up.fetch
"refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
echo "$the_commit commit refs/remotes/origin/master"
>expect &&
@@ -157,9 +157,9 @@ test_expect_success 'fetch with insteadOf' '
(
TRASH=$(pwd)/ &&
cd testrepo &&
- git config "url.$TRASH.insteadOf" trash/ &&
- git config remote.up.url trash/. &&
- git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*"
&&
+ test_config "url.$TRASH.insteadOf" trash/ &&
+ test_config remote.up.url trash/. &&
+ test_config remote.up.fetch
"refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
echo "$the_commit commit refs/remotes/origin/master"
>expect &&
@@ -173,9 +173,9 @@ test_expect_success 'fetch with pushInsteadOf (should not
rewrite)' '
(
TRASH=$(pwd)/ &&
cd testrepo &&
- git config "url.trash/.pushInsteadOf" "$TRASH" &&
- git config remote.up.url "$TRASH." &&
- git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*"
&&
+ test_config "url.trash/.pushInsteadOf" "$TRASH" &&
+ test_config remote.up.url "$TRASH." &&
+ test_config remote.up.fetch
"refs/heads/*:refs/remotes/origin/*" &&
git fetch up &&
echo "$the_commit commit refs/remotes/origin/master"
>expect &&
@@ -780,7 +780,7 @@ test_expect_success 'mixed ref updates, deletes, invalid
deletes trigger hooks w
test_expect_success 'allow deleting a ref using --delete' '
mk_test testrepo heads/master &&
- (cd testrepo && git config receive.denyDeleteCurrent warn) &&
+ (cd testrepo && test_config receive.denyDeleteCurrent warn) &&
git push testrepo --delete master &&
(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
'
@@ -809,7 +809,7 @@ test_expect_success 'warn on push to HEAD of non-bare
repository' '
(
cd testrepo &&
git checkout master &&
- git config receive.denyCurrentBranch warn
+ test_config receive.denyCurrentBranch warn
) &&
git push testrepo master 2>stderr &&
grep "warning: updating the current branch" stderr
@@ -820,7 +820,7 @@ test_expect_success 'deny push to HEAD of non-bare
repository' '
(
cd testrepo &&
git checkout master &&
- git config receive.denyCurrentBranch true
+ test_config receive.denyCurrentBranch true
) &&
test_must_fail git push testrepo master
'
@@ -830,8 +830,8 @@ test_expect_success 'allow push to HEAD of bare repository
(bare)' '
(
cd testrepo &&
git checkout master &&
- git config receive.denyCurrentBranch true &&
- git config core.bare true
+ test_config receive.denyCurrentBranch true &&
+ test_config core.bare true
) &&
git push testrepo master 2>stderr &&
! grep "warning: updating the current branch" stderr
@@ -842,7 +842,7 @@ test_expect_success 'allow push to HEAD of non-bare
repository (config)' '
(
cd testrepo &&
git checkout master &&
- git config receive.denyCurrentBranch false
+ test_config receive.denyCurrentBranch false
) &&
git push testrepo master 2>stderr &&
! grep "warning: updating the current branch" stderr
@@ -918,7 +918,7 @@ test_expect_success 'push into aliased refs (consistent)' '
cd child1 &&
git branch foo &&
git symbolic-ref refs/heads/bar refs/heads/foo
- git config receive.denyCurrentBranch false
+ test_config receive.denyCurrentBranch false
) &&
(
cd child2 &&
@@ -940,7 +940,7 @@ test_expect_success 'push into aliased refs (inconsistent)'
'
cd child1 &&
git branch foo &&
git symbolic-ref refs/heads/bar refs/heads/foo
- git config receive.denyCurrentBranch false
+ test_config receive.denyCurrentBranch false
) &&
(
cd child2 &&
@@ -1006,7 +1006,7 @@ test_expect_success 'push --porcelain rejected' '
git push testrepo refs/heads/master:refs/remotes/origin/master &&
(cd testrepo &&
git reset --hard origin/master^
- git config receive.denyCurrentBranch true) &&
+ test_config receive.denyCurrentBranch true) &&
echo >.git/foo "To testrepo" &&
echo >>.git/foo "! refs/heads/master:refs/heads/master [remote
rejected] (branch is currently checked out)" &&
@@ -1020,7 +1020,7 @@ test_expect_success 'push --porcelain --dry-run rejected'
'
git push testrepo refs/heads/master:refs/remotes/origin/master &&
(cd testrepo &&
git reset --hard origin/master
- git config receive.denyCurrentBranch true) &&
+ test_config receive.denyCurrentBranch true) &&
echo >.git/foo "To testrepo" &&
echo >>.git/foo "! refs/heads/master^:refs/heads/master
[rejected] (non-fast-forward)" &&
@@ -1052,7 +1052,7 @@ do
mk_test testrepo heads/master hidden/one hidden/two
hidden/three &&
(
cd testrepo &&
- git config $configsection.hiderefs refs/hidden
+ test_config $configsection.hiderefs refs/hidden
) &&
# push to unhidden ref succeeds normally
@@ -1078,7 +1078,7 @@ test_expect_success 'fetch exact SHA1' '
git push testrepo master:refs/hidden/one &&
(
cd testrepo &&
- git config transfer.hiderefs refs/hidden
+ test_config transfer.hiderefs refs/hidden
) &&
check_push_result testrepo $the_commit hidden/one &&
@@ -1098,7 +1098,7 @@ test_expect_success 'fetch exact SHA1' '
# the server side can allow it to succeed
(
cd ../testrepo &&
- git config uploadpack.allowtipsha1inwant true
+ test_config uploadpack.allowtipsha1inwant true
) &&
git fetch -v ../testrepo $the_commit:refs/heads/copy &&
@@ -1126,8 +1126,8 @@ test_expect_success 'fetch follows tags by default' '
(
cd dst &&
git remote add origin ../src &&
- git config branch.master.remote origin &&
- git config branch.master.merge refs/heads/master &&
+ test_config branch.master.remote origin &&
+ test_config branch.master.merge refs/heads/master &&
git pull &&
git for-each-ref >../actual
) &&
--
1.8.3.1.499.g7ad3486.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
