From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 08/16] t/t5516-fetch-push: use test_config()
Date: Fri, 21 Jun 2013 16:42:32 +0530 [thread overview]
Message-ID: <1371813160-4200-9-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371813160-4200-1-git-send-email-artagnon@gmail.com>
Replace the 'git config' calls in tests with test_config for greater
robustness.
Signed-off-by: Ramkumar Ramachandra <artagnon@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
next prev parent reply other threads:[~2013-06-21 11:16 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 11:12 [PATCH 00/16] Cleanup {branches,remotes}-file cruft Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 01/16] t/t5505-remote: modernize subshell-style of one test Ramkumar Ramachandra
2013-06-21 22:04 ` Junio C Hamano
2013-06-22 6:24 ` Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 02/16] t/t5505-remote: test push-refspec in branches-file Ramkumar Ramachandra
2013-06-21 22:08 ` Junio C Hamano
2013-06-21 11:12 ` [PATCH 03/16] t/t5505-remote: use test_path_is_missing Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 04/16] t/t5505-remote: remove dependency on $origin_url Ramkumar Ramachandra
2013-06-21 22:10 ` Junio C Hamano
2013-06-22 6:27 ` Ramkumar Ramachandra
2013-06-22 21:10 ` Junio C Hamano
2013-06-23 7:51 ` Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 05/16] remote: remove dead code in read_branches_file() Ramkumar Ramachandra
2013-06-21 22:26 ` Junio C Hamano
2013-06-22 7:36 ` Ramkumar Ramachandra
2013-06-23 8:07 ` Junio C Hamano
2013-06-23 8:37 ` Ramkumar Ramachandra
2013-06-23 21:15 ` Junio C Hamano
2013-06-21 11:12 ` [PATCH 06/16] t/t5505-remote: test url-with-# in branches-file Ramkumar Ramachandra
2013-06-21 22:28 ` Junio C Hamano
2013-06-22 7:16 ` Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 07/16] t/t5516-fetch-push: don't use branches-file Ramkumar Ramachandra
2013-06-21 22:29 ` Junio C Hamano
2013-06-21 11:12 ` Ramkumar Ramachandra [this message]
2013-06-21 22:32 ` [PATCH 08/16] t/t5516-fetch-push: use test_config() Junio C Hamano
2013-06-22 7:15 ` Ramkumar Ramachandra
2013-06-22 9:57 ` Johannes Sixt
2013-06-21 11:12 ` [PATCH 09/16] ls-remote doc: fix example invocation on git.git Ramkumar Ramachandra
2013-06-21 22:38 ` Junio C Hamano
2013-06-21 11:12 ` [PATCH 10/16] ls-remote doc: rewrite <repository> paragraph Ramkumar Ramachandra
2013-06-21 22:39 ` Junio C Hamano
2013-06-21 11:12 ` [PATCH 11/16] ls-remote doc: don't encourage use of branches-file Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 12/16] t/t5505-remote: modernize subshell-style of one test Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 13/16] t/t5505-remote: test multiple push/pull in remotes-file Ramkumar Ramachandra
2013-06-21 22:53 ` Eric Sunshine
2013-06-22 7:41 ` Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 14/16] t/t5510-fetch: don't use remotes-file Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 15/16] t/t5515-fetch-merge-logic: don't use {branches,remotes}-file Ramkumar Ramachandra
2013-06-21 11:12 ` [PATCH 16/16] remote: deprecate read_{branches,remotes}_file Ramkumar Ramachandra
2013-06-21 14:32 ` [PATCH 00/16] Cleanup {branches,remotes}-file cruft Junio C Hamano
2013-06-21 16:22 ` Ramkumar Ramachandra
2013-06-21 16:33 ` Junio C Hamano
2013-06-21 19:09 ` Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371813160-4200-9-git-send-email-artagnon@gmail.com \
--to=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).