Re: [PATCH 04/16] t/t5505-remote: remove dependency on $origin_url
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 21, 2013, 22:10 UTC
- Message-ID
- <7v61x7ktcw.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1371813160-4200-5-git-send-email-artagnon@gmail.com>
Ramkumar Ramachandra <artagnon@gmail.com> writes:
Show 6 quoted lines
> 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".Is there a reason why "quux" is better than another randomly chosen string "$(pwd)/one"?
Show 47 quoted lines
> > Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> > --- > t/t5505-remote.sh | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh > index dcb6c2f..fd0a81e 100755 > --- a/t/t5505-remote.sh > +++ b/t/t5505-remote.sh > @@ -669,21 +669,20 @@ 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 && > mkdir -p .git/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") > ' > @@ -694,10 +693,10 @@ test_expect_success 'migrate a remote from named file in $GIT_DIR/branches' ' > ( > 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" > )