From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Git List <git@vger.kernel.org>
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 04/14] t/t5505-remote: remove dependency on $origin_url
Date: Sat, 22 Jun 2013 13:28:11 +0530 [thread overview]
Message-ID: <1371887901-5659-5-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1371887901-5659-1-git-send-email-artagnon@gmail.com>
In the tests "migrate a remote from named file in
$GIT_DIR/{remotes,branches}", we are only checking that a configuration
is migrated successfully; it has no correspondence with whether or not
those values do something sensible with other git
operations (fetch/push). Therefore, there is no need to determine
$origin_url: just substitute it with the constant value "quux".
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
t/t5505-remote.sh | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
index d688662..13199d1 100755
--- a/t/t5505-remote.sh
+++ b/t/t5505-remote.sh
@@ -733,14 +733,13 @@ test_expect_success 'rename a remote with name prefix of other remote' '
'
cat >remotes_origin <<-EOF
-URL: $(pwd)/one
+URL: quux
Push: refs/heads/master:refs/heads/upstream
Pull: refs/heads/master:refs/heads/origin
EOF
test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
git clone one five &&
- origin_url=$(pwd)/one &&
(
cd five &&
git remote remove origin &&
@@ -748,7 +747,7 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
cat ../remotes_origin >.git/remotes/origin &&
git remote rename origin origin &&
test_path_is_missing .git/remotes/origin &&
- test "$(git config remote.origin.url)" = "$origin_url" &&
+ test "$(git config remote.origin.url)" = "quux" &&
test "$(git config remote.origin.push)" = "refs/heads/master:refs/heads/upstream" &&
test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin"
)
@@ -756,14 +755,13 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/remotes' '
test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' '
git clone one six &&
- origin_url=$(pwd)/one &&
(
cd six &&
git remote rm origin &&
- echo "$origin_url" >.git/branches/origin &&
+ echo "quux" >.git/branches/origin &&
git remote rename origin origin &&
test_path_is_missing .git/branches/origin &&
- test "$(git config remote.origin.url)" = "$origin_url" &&
+ test "$(git config remote.origin.url)" = "quux" &&
test "$(git config remote.origin.fetch)" = "refs/heads/master:refs/heads/origin" &&
test "$(git config remote.origin.push)" = "HEAD:refs/heads/master"
)
--
1.8.3.1.498.gacf2885
next prev parent reply other threads:[~2013-06-22 8:01 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-22 7:58 [PATCH v2 00/14] Classify {branches,remotes}-file as fringe features Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 01/14] t/t5505-remote: modernize style Ramkumar Ramachandra
2013-06-23 7:42 ` Junio C Hamano
2013-06-23 7:50 ` Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 02/14] t/t5505-remote: test push-refspec in branches-file Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 03/14] t/t5505-remote: use test_path_is_missing Ramkumar Ramachandra
2013-06-22 7:58 ` Ramkumar Ramachandra [this message]
2013-06-22 7:58 ` [PATCH v2 05/14] remote: remove dead code in read_branches_file() Ramkumar Ramachandra
2013-06-23 7:19 ` Junio C Hamano
2013-06-22 7:58 ` [PATCH v2 06/14] t/t5505-remote: test url-with-# in branches-file Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 07/14] t/t5516-fetch-push: don't use branches-file Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 08/14] ls-remote doc: fix example invocation on git.git Ramkumar Ramachandra
2013-06-23 7:22 ` Junio C Hamano
2013-06-23 7:53 ` Ramkumar Ramachandra
2013-06-23 8:04 ` Junio C Hamano
2013-06-22 7:58 ` [PATCH v2 09/14] ls-remote doc: rewrite <repository> paragraph Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 10/14] ls-remote doc: don't encourage use of branches-file Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 11/14] t/t5505-remote: test multiple push/pull in remotes-file Ramkumar Ramachandra
2013-06-23 8:07 ` Junio C Hamano
2013-06-23 8:28 ` Ramkumar Ramachandra
2013-06-23 21:49 ` Junio C Hamano
2013-06-22 7:58 ` [PATCH v2 12/14] t/t5510-fetch: don't use remotes-file Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 13/14] t/t5515-fetch-merge-logic: don't use {branches,remotes}-file Ramkumar Ramachandra
[not found] ` <CA+gHt1B1pKz5iU+9m_gi36u7g91qZqgdkY97WDAWjRGxu-Vjuw@mail.gmail.com>
2013-06-25 10:20 ` Ramkumar Ramachandra
2013-06-22 7:58 ` [PATCH v2 14/14] remote: add comment about read_{branches,remotes}_file 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1371887901-5659-5-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.
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 NNTP newsgroup(s).