From: Junio C Hamano <gitster@pobox.com>
To: "Daniel Graña" <dangra@gmail.com>
Cc: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] Improve tests for detached worktree in git-submodule
Date: Mon, 30 Jul 2012 10:44:32 -0700 [thread overview]
Message-ID: <7vsjc9qh33.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <CAHCkQtPmJdFBk7G-EP70FwtkRk11Utp+rppjNrEZFtZgOVrObA@mail.gmail.com> ("Daniel Graña"'s message of "Mon, 30 Jul 2012 14:18:22 -0300")
Daniel Graña <dangra@gmail.com> writes:
> On Mon, Jul 30, 2012 at 2:02 PM, Junio C Hamano <gitster@pobox.com> wrote:
>> Daniel Graña <dangra@gmail.com> writes:
>>
>>> Signed-off-by: Daniel Graña <dangra@gmail.com>
>>> ---
>>> t/t7409-submodule-detached-worktree.sh | 31 ++++++++++++++++++++++++-------
>>> 1 files changed, 24 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/t/t7409-submodule-detached-worktree.sh b/t/t7409-submodule-detached-worktree.sh
>>> index db75642..d88f400 100755
>>> --- a/t/t7409-submodule-detached-worktree.sh
>>> +++ b/t/t7409-submodule-detached-worktree.sh
>>> @@ -15,7 +15,11 @@ TEST_NO_CREATE_REPO=1
>>> test_expect_success 'submodule on detached working tree' '
>>> git init --bare remote &&
>>> test_create_repo bundle1 &&
>>> - (cd bundle1 && test_commit "shoot") &&
>>> + (
>>> + cd bundle1 &&
>>> + test_commit "shoot" &&
>>> + git rev-list --max-count=1 HEAD > "$TRASH_DIRECTORY/expect"
>>
>> Better written as
>>
>> git rev-parse --verify HEAD >../expect
>>
>> methinks.
>
> You rule here,
>
> is it still better than "git rev-parse --max-count=1 HEAD" seen in
> t7406-submodule.update.sh?
"git rev-parse --max-count=1 HEAD" will show "--max-count=1\n"
followed by the value of HEAD, so if the expected result and the
actual result were both prepared by that command, the comparison
would succeed (as the irrelevant --max-count=1 line will appear in
both output), but honestly, I do not think it makes any sense.
Who wrote that crap?
>
>>
>>> + ) &&
>>> mkdir home &&
>>> (
>>> cd home &&
>>> @@ -23,14 +27,27 @@ test_expect_success 'submodule on detached working tree' '
>>> git clone --bare ../remote .dotfiles &&
>>> git submodule add ../bundle1 .vim/bundle/sogood &&
>>> test_commit "sogood" &&
>>> + (
>>> + unset GIT_WORK_TREE GIT_DIR &&
>>> + cd .vim/bundle/sogood &&
>>> + git rev-list --max-count=1 HEAD > actual &&
>>> + test_cmp actual "$TRASH_DIRECTORY/expect"
>>
>> Likewise.
>>
>> git rev-parse --verify HEAD >actual &&
>> test_cmp ../expect actual
>
> I tried to avoid the too many ".." usage, in that case it'd be:
>
> test_cmp ../../../../expect actual
"$TRASH_DIRECTORY/expect" is fine as well. Just drop the extra SP
between the redirection '>' and the filename, and make sure the
filename is inside double quotes for some versions of bash that
issue an unnecessary warning.
>>> + git checkout master &&
>>
>> So you populate the newly created home2 working tree out of the .otfiles
>> repository in it.
>
> right, before it wasn't creating ~/.gitmodules and "git subodule
> update --init" wasn't taking effect.
Good.
>> Is the "existence" the only thing you care about? That's not all
>> that different from the old test that only checked the existence of
>> the directory dupe, no?
>
> Except the submodule wasn't updating but the directory still existed
> so test passed, now it check for a file that exists only if the
> submodule update works.
OK.
next prev parent reply other threads:[~2012-07-30 17:44 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-30 16:10 [PATCH] Improve tests for detached worktree in git-submodule Daniel Graña
2012-07-30 16:39 ` Jeff King
[not found] ` <CAHCkQtNyNGBm8Z8FP7BybVOW0zQNgpxjwW_akLepYfLc-U+0cg@mail.gmail.com>
2012-07-30 17:06 ` Fwd: " Daniel Graña
2012-07-30 17:02 ` Junio C Hamano
2012-07-30 17:18 ` Daniel Graña
2012-07-30 17:44 ` Junio C Hamano [this message]
2012-07-30 17:51 ` Junio C Hamano
2012-07-30 17:51 ` Daniel Graña
2012-07-30 18:09 ` Junio C Hamano
2012-07-30 18:15 ` Daniel Graña
2012-07-30 17:43 ` Daniel Graña
2012-07-30 17:50 ` Daniel Graña
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=7vsjc9qh33.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=dangra@gmail.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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).