From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, "Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>,
"Jeff King" <peff@peff.net>,
"Christian Couder" <christian.couder@gmail.com>,
"Ben Peart" <benpeart@microsoft.com>
Subject: Re: [PATCH] status: add a failing test showing a core.untrackedCache bug
Date: Wed, 27 Dec 2017 19:50:29 +0100 [thread overview]
Message-ID: <87mv24qa2y.fsf@evledraar.gmail.com> (raw)
In-Reply-To: <xmqqlghoniuk.fsf@gitster.mtv.corp.google.com>
On Wed, Dec 27 2017, Junio C. Hamano jotted:
> Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
>
>> +status_is_clean() {
>> + >../status.expect &&
>> + git status --porcelain >../status.actual &&
>> + test_cmp ../status.expect ../status.actual
>> +}
>> +
>> test_lazy_prereq UNTRACKED_CACHE '
>> { git update-index --test-untracked-cache; ret=$?; } &&
>> test $ret -ne 1
>> @@ -683,4 +689,43 @@ test_expect_success 'untracked cache survives a commit' '
>> test_cmp ../before ../after
>> '
>>
>> +test_expect_success 'teardown worktree' '
>> + cd ..
>> +'
>
> Funny indentation.
Thanks. I'll submit a new series with all 3 patches with the issues you
brought up mentioned...
>> +test_expect_success 'setup worktree for symlink test' '
>> + git init worktree-symlink &&
>> + cd worktree-symlink &&
>> + git config core.untrackedCache true &&
>> + mkdir one two &&
>> + touch one/file two/file &&
>> + git add one/file two/file &&
>> + git commit -m"first commit" &&
>> + git rm -rf one &&
>> + ln -s two one &&
>> + git add one &&
>> + git commit -m"second commit"
>> +'
>
> This needs SYMLINKS prereq, which in turn means it cannot be tested
> on certain platforms. I thought Duy's answer was that this does not
> need to involve a symbolic link at all? If so, perhaps we can have
> another test that does not need symlink?
... as soon as I figure out how to add such a non-symlink test as well
(seems sensible to test both), but I can't bring it to fail without
symlinks, I just adjusted my test script to do this instead:
(
rm -rf /tmp/testrepo &&
git init /tmp/testrepo &&
cd /tmp/testrepo &&
mkdir x y &&
touch x/a y/b &&
git add x/a y/b &&
git commit -msnap &&
git rm -rf y &&
mkdir y &&
touch y/c &&
git add y &&
git commit -msnap2 &&
git checkout HEAD~ &&
git status &&
git checkout master &&
sleep 1 &&
git status &&
git status
)
Duy, what am I missing here?
next prev parent reply other threads:[~2017-12-27 18:50 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 14:00 [PATCH] status: add a failing test showing a core.untrackedCache bug Ævar Arnfjörð Bjarmason
2017-12-25 11:26 ` Duy Nguyen
2017-12-25 18:45 ` Ævar Arnfjörð Bjarmason
2017-12-26 10:47 ` Duy Nguyen
2017-12-27 10:25 ` Duy Nguyen
2017-12-27 11:28 ` [PATCH 3/1] update-index doc: note a fixed bug in the untracked cache Ævar Arnfjörð Bjarmason
2017-12-27 18:07 ` Junio C Hamano
2017-12-27 17:50 ` [PATCH] status: add a failing test showing a core.untrackedCache bug Eric Sunshine
2017-12-27 18:09 ` Junio C Hamano
2017-12-27 18:50 ` Ævar Arnfjörð Bjarmason [this message]
2017-12-28 6:10 ` Duy Nguyen
2017-12-28 18:34 ` Junio C Hamano
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=87mv24qa2y.fsf@evledraar.gmail.com \
--to=avarab@gmail.com \
--cc=benpeart@microsoft.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--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).