2015-03-08 11:12:44 +01:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='test untracked cache'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
t7063: work around FreeBSD's lazy mtime update feature
Let's start with the commit message of [1] from freebsd.git [2]
Sync timestamp changes for inodes of special files to disk as late
as possible (when the inode is reclaimed). Temporarily only do
this if option UFS_LAZYMOD configured and softupdates aren't
enabled. UFS_LAZYMOD is intentionally left out of
/sys/conf/options.
This is mainly to avoid almost useless disk i/o on battery powered
machines. It's silly to write to disk (on the next sync or when
the inode becomes inactive) just because someone hit a key or
something wrote to the screen or /dev/null.
PR: 5577 [3]
The short version of that, in the context of t7063, is that when a
directory is updated, its mtime may be updated later, not
immediately. This can be shown with a simple command sequence
date; sleep 1; touch abc; rm abc; sleep 10; ls -lTd .
One would expect that the date shown in `ls` would be one second from
`date`, but it's 10 seconds later. If we put another `ls -lTd .` in
front of `sleep 10`, then the date of the last `ls` comes as
expected. The first `ls` somehow forces mtime to be updated.
t7063 is really sensitive to directory mtime. When mtime is too "new",
git code suspects racy timestamps and will not trigger the shortcut in
untracked cache, in t7063.24 and eventually be detected in t7063.27
We have two options thanks to this special FreeBSD feature:
1) Stop supporting untracked cache on FreeBSD. Skip t7063 entirely
when running on FreeBSD
2) Work around this problem (using the same 'ls' trick) and continue
to support untracked cache on FreeBSD
I initially wanted to go with 1) because I didn't know the exact
nature of this feature and feared that it would make untracked cache
work unreliably, using the cached version when it should not.
Since the behavior of this thing is clearer now. The picture is not
that bad. If this indeed happens often, untracked cache would assume
racy condition more often and _fall back_ to non-untracked cache code
paths. Which means it may be less effective, but it will not show
wrong things.
This patch goes with option 2.
PS. For those who want to look further in FreeBSD source code, this
flag is now called IN_LAZYMOD. I can see it's effective in ext2 and
ufs. zfs is not affected.
[1] 660e6408e6df99a20dacb070c5e7f9739efdf96d
[2] git://github.com/freebsd/freebsd.git
[3] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=5577
Reported-by: Eric Wong <e@80x24.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-03 19:45:22 +02:00
|
|
|
# On some filesystems (e.g. FreeBSD's ext2 and ufs) directory mtime
|
|
|
|
|
# is updated lazily after contents in the directory changes, which
|
|
|
|
|
# forces the untracked cache code to take the slow path. A test
|
|
|
|
|
# that wants to make sure that the fast path works correctly should
|
|
|
|
|
# call this helper to make mtime of the containing directory in sync
|
|
|
|
|
# with the reality before checking the fast path behaviour.
|
|
|
|
|
#
|
|
|
|
|
# See <20160803174522.5571-1-pclouds@gmail.com> if you want to know
|
|
|
|
|
# more.
|
|
|
|
|
|
2018-02-28 22:21:09 +01:00
|
|
|
GIT_FORCE_UNTRACKED_CACHE=true
|
|
|
|
|
export GIT_FORCE_UNTRACKED_CACHE
|
2018-02-05 20:56:19 +01:00
|
|
|
|
t7063: work around FreeBSD's lazy mtime update feature
Let's start with the commit message of [1] from freebsd.git [2]
Sync timestamp changes for inodes of special files to disk as late
as possible (when the inode is reclaimed). Temporarily only do
this if option UFS_LAZYMOD configured and softupdates aren't
enabled. UFS_LAZYMOD is intentionally left out of
/sys/conf/options.
This is mainly to avoid almost useless disk i/o on battery powered
machines. It's silly to write to disk (on the next sync or when
the inode becomes inactive) just because someone hit a key or
something wrote to the screen or /dev/null.
PR: 5577 [3]
The short version of that, in the context of t7063, is that when a
directory is updated, its mtime may be updated later, not
immediately. This can be shown with a simple command sequence
date; sleep 1; touch abc; rm abc; sleep 10; ls -lTd .
One would expect that the date shown in `ls` would be one second from
`date`, but it's 10 seconds later. If we put another `ls -lTd .` in
front of `sleep 10`, then the date of the last `ls` comes as
expected. The first `ls` somehow forces mtime to be updated.
t7063 is really sensitive to directory mtime. When mtime is too "new",
git code suspects racy timestamps and will not trigger the shortcut in
untracked cache, in t7063.24 and eventually be detected in t7063.27
We have two options thanks to this special FreeBSD feature:
1) Stop supporting untracked cache on FreeBSD. Skip t7063 entirely
when running on FreeBSD
2) Work around this problem (using the same 'ls' trick) and continue
to support untracked cache on FreeBSD
I initially wanted to go with 1) because I didn't know the exact
nature of this feature and feared that it would make untracked cache
work unreliably, using the cached version when it should not.
Since the behavior of this thing is clearer now. The picture is not
that bad. If this indeed happens often, untracked cache would assume
racy condition more often and _fall back_ to non-untracked cache code
paths. Which means it may be less effective, but it will not show
wrong things.
This patch goes with option 2.
PS. For those who want to look further in FreeBSD source code, this
flag is now called IN_LAZYMOD. I can see it's effective in ext2 and
ufs. zfs is not affected.
[1] 660e6408e6df99a20dacb070c5e7f9739efdf96d
[2] git://github.com/freebsd/freebsd.git
[3] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=5577
Reported-by: Eric Wong <e@80x24.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-03 19:45:22 +02:00
|
|
|
sync_mtime () {
|
|
|
|
|
find . -type d -ls >/dev/null
|
|
|
|
|
}
|
|
|
|
|
|
2015-03-08 11:12:44 +01:00
|
|
|
avoid_racy() {
|
|
|
|
|
sleep 1
|
|
|
|
|
}
|
|
|
|
|
|
2015-05-27 11:34:58 +02:00
|
|
|
test_lazy_prereq UNTRACKED_CACHE '
|
config: add core.untrackedCache
When we know that mtime on directory as given by the environment
is usable for the purpose of untracked cache, we may want the
untracked cache to be always used without any mtime test or
kernel name check being performed.
Also when we know that mtime is not usable for the purpose of
untracked cache, for example because the repo is shared over a
network file system, we may want the untracked-cache to be
automatically removed from the index.
Allow the user to express such preference by setting the
'core.untrackedCache' configuration variable, which can take
'keep', 'false', or 'true' and default to 'keep'.
When read_index_from() is called, it now adds or removes the
untracked cache in the index to respect the value of this
variable. So it does nothing if the value is `keep` or if the
variable is unset; it adds the untracked cache if the value is
`true`; and it removes the cache if the value is `false`.
`git update-index --[no-|force-]untracked-cache` still adds the
untracked cache to, or removes it, from the index, but this
shows a warning if it goes against the value of
core.untrackedCache, because the next time the index is read
the untracked cache will be added or removed if the
configuration is set to do so.
Also `--untracked-cache` used to check that the underlying
operating system and file system change `st_mtime` field of a
directory if files are added or deleted in that directory. But
because those tests take a long time, `--untracked-cache` no
longer performs them. Instead, there is now
`--test-untracked-cache` to perform the tests. This change
makes `--untracked-cache` the same as `--force-untracked-cache`.
This last change is backward incompatible and should be
mentioned in the release notes.
Helped-by: Duy Nguyen <pclouds@gmail.com>
Helped-by: Torsten Bögershausen <tboegi@web.de>
Helped-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
read-cache: Duy'sfixup
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-01-27 07:58:05 +01:00
|
|
|
{ git update-index --test-untracked-cache; ret=$?; } &&
|
2015-05-27 11:34:58 +02:00
|
|
|
test $ret -ne 1
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
if ! test_have_prereq UNTRACKED_CACHE; then
|
2015-03-08 11:12:44 +01:00
|
|
|
skip_all='This system does not support untracked cache'
|
|
|
|
|
test_done
|
|
|
|
|
fi
|
|
|
|
|
|
2016-01-27 07:58:07 +01:00
|
|
|
test_expect_success 'core.untrackedCache is unset' '
|
|
|
|
|
test_must_fail git config --get core.untrackedCache
|
|
|
|
|
'
|
|
|
|
|
|
2015-03-08 11:12:44 +01:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
|
git init worktree &&
|
|
|
|
|
cd worktree &&
|
|
|
|
|
mkdir done dtwo dthree &&
|
|
|
|
|
touch one two three done/one dtwo/two dthree/three &&
|
|
|
|
|
git add one two done/one &&
|
|
|
|
|
: >.git/info/exclude &&
|
|
|
|
|
git update-index --untracked-cache
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache is empty' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
2016-01-27 07:58:07 +01:00
|
|
|
cat >../expect-empty <<EOF &&
|
2015-03-08 11:12:44 +01:00
|
|
|
info/exclude 0000000000000000000000000000000000000000
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
EOF
|
2016-01-27 07:58:07 +01:00
|
|
|
test_cmp ../expect-empty ../actual
|
2015-03-08 11:12:44 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
A two
|
|
|
|
|
?? dthree/
|
|
|
|
|
?? dtwo/
|
|
|
|
|
?? three
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >../dump.expect <<EOF &&
|
2016-07-16 07:06:25 +02:00
|
|
|
info/exclude $EMPTY_BLOB
|
2015-03-08 11:12:44 +01:00
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
dthree/
|
|
|
|
|
dtwo/
|
|
|
|
|
three
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
three
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_expect_success 'status first time (empty cache)' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 3
|
|
|
|
|
gitignore invalidation: 1
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 4
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache after first status' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../dump.expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'status second time (fully populated cache)' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache after second status' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../dump.expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'modify in root directory, one dir invalidation' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >four &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
A two
|
|
|
|
|
?? dthree/
|
|
|
|
|
?? dtwo/
|
|
|
|
|
?? four
|
|
|
|
|
?? three
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 1
|
|
|
|
|
opendir: 1
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
2016-07-16 07:06:25 +02:00
|
|
|
info/exclude $EMPTY_BLOB
|
2015-03-08 11:12:44 +01:00
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
dthree/
|
|
|
|
|
dtwo/
|
|
|
|
|
four
|
|
|
|
|
three
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
three
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'new .gitignore invalidates recursively' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
echo four >.gitignore &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
A two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? dthree/
|
|
|
|
|
?? dtwo/
|
|
|
|
|
?? three
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 1
|
|
|
|
|
directory invalidation: 1
|
|
|
|
|
opendir: 4
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
2016-07-16 07:06:25 +02:00
|
|
|
info/exclude $EMPTY_BLOB
|
2015-03-08 11:12:44 +01:00
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dthree/
|
|
|
|
|
dtwo/
|
|
|
|
|
three
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
three
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'new info/exclude invalidates everything' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
echo three >>.git/info/exclude &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
A two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 1
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 4
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'move two from tracked to untracked' '
|
|
|
|
|
git rm --cached two &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'status after the move' '
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? dtwo/
|
|
|
|
|
?? two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 1
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
two
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'move two from untracked to tracked' '
|
|
|
|
|
git add two &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'status after the move' '
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
A done/one
|
|
|
|
|
A one
|
|
|
|
|
A two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 1
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
2015-07-31 19:35:01 +02:00
|
|
|
test_expect_success 'set up for sparse checkout testing' '
|
|
|
|
|
echo two >done/.gitignore &&
|
|
|
|
|
echo three >>done/.gitignore &&
|
|
|
|
|
echo two >done/two &&
|
|
|
|
|
git add -f done/two done/.gitignore &&
|
|
|
|
|
git commit -m "first commit"
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'status after commit' '
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
2015-08-19 15:01:26 +02:00
|
|
|
opendir: 2
|
2015-07-31 19:35:01 +02:00
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache correct after commit' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
/done/ 0000000000000000000000000000000000000000 recurse valid
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'set up sparse checkout' '
|
|
|
|
|
echo "done/[a-z]*" >.git/info/sparse-checkout &&
|
|
|
|
|
test_config core.sparsecheckout true &&
|
|
|
|
|
git checkout master &&
|
2015-08-19 15:01:24 +02:00
|
|
|
git update-index --force-untracked-cache &&
|
2015-07-31 19:35:01 +02:00
|
|
|
git status --porcelain >/dev/null && # prime the cache
|
|
|
|
|
test_path_is_missing done/.gitignore &&
|
|
|
|
|
test_path_is_file done/one
|
|
|
|
|
'
|
|
|
|
|
|
2015-08-19 15:01:25 +02:00
|
|
|
test_expect_success 'create/modify files, some of which are gitignored' '
|
|
|
|
|
echo two bis >done/two &&
|
2015-07-31 19:35:01 +02:00
|
|
|
echo three >done/three && # three is gitignored
|
|
|
|
|
echo four >done/four && # four is gitignored at a higher level
|
2015-10-19 21:48:15 +02:00
|
|
|
echo five >done/five && # five is not gitignored
|
|
|
|
|
echo test >base && #we need to ensure that the root dir is touched
|
t7063: work around FreeBSD's lazy mtime update feature
Let's start with the commit message of [1] from freebsd.git [2]
Sync timestamp changes for inodes of special files to disk as late
as possible (when the inode is reclaimed). Temporarily only do
this if option UFS_LAZYMOD configured and softupdates aren't
enabled. UFS_LAZYMOD is intentionally left out of
/sys/conf/options.
This is mainly to avoid almost useless disk i/o on battery powered
machines. It's silly to write to disk (on the next sync or when
the inode becomes inactive) just because someone hit a key or
something wrote to the screen or /dev/null.
PR: 5577 [3]
The short version of that, in the context of t7063, is that when a
directory is updated, its mtime may be updated later, not
immediately. This can be shown with a simple command sequence
date; sleep 1; touch abc; rm abc; sleep 10; ls -lTd .
One would expect that the date shown in `ls` would be one second from
`date`, but it's 10 seconds later. If we put another `ls -lTd .` in
front of `sleep 10`, then the date of the last `ls` comes as
expected. The first `ls` somehow forces mtime to be updated.
t7063 is really sensitive to directory mtime. When mtime is too "new",
git code suspects racy timestamps and will not trigger the shortcut in
untracked cache, in t7063.24 and eventually be detected in t7063.27
We have two options thanks to this special FreeBSD feature:
1) Stop supporting untracked cache on FreeBSD. Skip t7063 entirely
when running on FreeBSD
2) Work around this problem (using the same 'ls' trick) and continue
to support untracked cache on FreeBSD
I initially wanted to go with 1) because I didn't know the exact
nature of this feature and feared that it would make untracked cache
work unreliably, using the cached version when it should not.
Since the behavior of this thing is clearer now. The picture is not
that bad. If this indeed happens often, untracked cache would assume
racy condition more often and _fall back_ to non-untracked cache code
paths. Which means it may be less effective, but it will not show
wrong things.
This patch goes with option 2.
PS. For those who want to look further in FreeBSD source code, this
flag is now called IN_LAZYMOD. I can see it's effective in ext2 and
ufs. zfs is not affected.
[1] 660e6408e6df99a20dacb070c5e7f9739efdf96d
[2] git://github.com/freebsd/freebsd.git
[3] https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=5577
Reported-by: Eric Wong <e@80x24.org>
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2016-08-03 19:45:22 +02:00
|
|
|
rm base &&
|
|
|
|
|
sync_mtime
|
2015-07-31 19:35:01 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'test sparse status with untracked cache' '
|
|
|
|
|
: >../trace &&
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
2015-08-19 15:01:25 +02:00
|
|
|
M done/two
|
2015-07-31 19:35:01 +02:00
|
|
|
?? .gitignore
|
|
|
|
|
?? done/five
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../status.actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 1
|
|
|
|
|
directory invalidation: 2
|
|
|
|
|
opendir: 2
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache correct after status' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
cat >../expect <<EOF &&
|
|
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
|
|
|
|
|
five
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../expect ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'test sparse status again with untracked cache' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
2015-08-19 15:01:25 +02:00
|
|
|
M done/two
|
2015-07-31 19:35:01 +02:00
|
|
|
?? .gitignore
|
|
|
|
|
?? done/five
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../status.actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
2015-08-19 15:01:25 +02:00
|
|
|
test_expect_success 'set up for test of subdir and sparse checkouts' '
|
|
|
|
|
mkdir done/sub &&
|
|
|
|
|
mkdir done/sub/sub &&
|
|
|
|
|
echo "sub" > done/sub/sub/file
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'test sparse status with untracked cache and subdir' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
M done/two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? done/five
|
|
|
|
|
?? done/sub/
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../status.actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 2
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 1
|
|
|
|
|
opendir: 3
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'verify untracked cache dump (sparse/subdirs)' '
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
2016-01-27 07:58:07 +01:00
|
|
|
cat >../expect-from-test-dump <<EOF &&
|
2015-08-19 15:01:25 +02:00
|
|
|
info/exclude 13263c0978fb9fad16b2d580fb800b6d811c3ff0
|
|
|
|
|
core.excludesfile 0000000000000000000000000000000000000000
|
|
|
|
|
exclude_per_dir .gitignore
|
|
|
|
|
flags 00000006
|
|
|
|
|
/ e6fcc8f2ee31bae321d66afd183fcb7237afae6e recurse valid
|
|
|
|
|
.gitignore
|
|
|
|
|
dtwo/
|
|
|
|
|
/done/ 1946f0437f90c5005533cbe1736a6451ca301714 recurse valid
|
|
|
|
|
five
|
|
|
|
|
sub/
|
|
|
|
|
/done/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
sub/
|
|
|
|
|
/done/sub/sub/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
file
|
|
|
|
|
/dthree/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
/dtwo/ 0000000000000000000000000000000000000000 recurse check_only valid
|
|
|
|
|
two
|
|
|
|
|
EOF
|
2016-01-27 07:58:07 +01:00
|
|
|
test_cmp ../expect-from-test-dump ../actual
|
2015-08-19 15:01:25 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'test sparse status again with untracked cache and subdir' '
|
|
|
|
|
avoid_racy &&
|
|
|
|
|
: >../trace &&
|
|
|
|
|
GIT_TRACE_UNTRACKED_STATS="$TRASH_DIRECTORY/trace" \
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
test_cmp ../status.expect ../status.actual &&
|
|
|
|
|
cat >../trace.expect <<EOF &&
|
|
|
|
|
node creation: 0
|
|
|
|
|
gitignore invalidation: 0
|
|
|
|
|
directory invalidation: 0
|
|
|
|
|
opendir: 0
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../trace.expect ../trace
|
|
|
|
|
'
|
|
|
|
|
|
2015-08-19 15:01:26 +02:00
|
|
|
test_expect_success 'move entry in subdir from untracked to cached' '
|
|
|
|
|
git add dtwo/two &&
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
M done/two
|
|
|
|
|
A dtwo/two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? done/five
|
|
|
|
|
?? done/sub/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../status.actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'move entry in subdir from cached to untracked' '
|
|
|
|
|
git rm --cached dtwo/two &&
|
|
|
|
|
git status --porcelain >../status.actual &&
|
|
|
|
|
cat >../status.expect <<EOF &&
|
|
|
|
|
M done/two
|
|
|
|
|
?? .gitignore
|
|
|
|
|
?? done/five
|
|
|
|
|
?? done/sub/
|
|
|
|
|
?? dtwo/
|
|
|
|
|
EOF
|
|
|
|
|
test_cmp ../status.expect ../status.actual
|
|
|
|
|
'
|
|
|
|
|
|
2016-01-27 07:58:07 +01:00
|
|
|
test_expect_success '--no-untracked-cache removes the cache' '
|
|
|
|
|
git update-index --no-untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
echo "no untracked cache" >../expect-no-uc &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git status does not change anything' '
|
|
|
|
|
git status &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setting core.untrackedCache to true and using git status creates the cache' '
|
|
|
|
|
git config core.untrackedCache true &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual &&
|
|
|
|
|
git status &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-from-test-dump ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'using --no-untracked-cache does not fail when core.untrackedCache is true' '
|
|
|
|
|
git update-index --no-untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual &&
|
|
|
|
|
git update-index --untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-empty ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setting core.untrackedCache to false and using git status removes the cache' '
|
|
|
|
|
git config core.untrackedCache false &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-empty ../actual &&
|
|
|
|
|
git status &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'using --untracked-cache does not fail when core.untrackedCache is false' '
|
|
|
|
|
git update-index --untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-empty ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'setting core.untrackedCache to keep' '
|
|
|
|
|
git config core.untrackedCache keep &&
|
|
|
|
|
git update-index --untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-empty ../actual &&
|
|
|
|
|
git status &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-from-test-dump ../actual &&
|
|
|
|
|
git update-index --no-untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-no-uc ../actual &&
|
|
|
|
|
git update-index --force-untracked-cache &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-empty ../actual &&
|
|
|
|
|
git status &&
|
|
|
|
|
test-dump-untracked-cache >../actual &&
|
|
|
|
|
test_cmp ../expect-from-test-dump ../actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'test ident field is working' '
|
|
|
|
|
mkdir ../other_worktree &&
|
|
|
|
|
cp -R done dthree dtwo four three ../other_worktree &&
|
|
|
|
|
GIT_WORK_TREE=../other_worktree git status 2>../err &&
|
|
|
|
|
echo "warning: Untracked cache is disabled on this system or location." >../expect &&
|
2016-06-17 22:21:07 +02:00
|
|
|
test_i18ncmp ../expect ../err
|
2016-01-27 07:58:07 +01:00
|
|
|
'
|
|
|
|
|
|
2017-05-08 11:41:42 +02:00
|
|
|
test_expect_success 'untracked cache survives a checkout' '
|
|
|
|
|
git commit --allow-empty -m empty &&
|
|
|
|
|
test-dump-untracked-cache >../before &&
|
|
|
|
|
test_when_finished "git checkout master" &&
|
|
|
|
|
git checkout -b other_branch &&
|
|
|
|
|
test-dump-untracked-cache >../after &&
|
|
|
|
|
test_cmp ../before ../after &&
|
|
|
|
|
test_commit test &&
|
|
|
|
|
test-dump-untracked-cache >../before &&
|
|
|
|
|
git checkout master &&
|
|
|
|
|
test-dump-untracked-cache >../after &&
|
|
|
|
|
test_cmp ../before ../after
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'untracked cache survives a commit' '
|
|
|
|
|
test-dump-untracked-cache >../before &&
|
|
|
|
|
git add done/two &&
|
|
|
|
|
git commit -m commit &&
|
|
|
|
|
test-dump-untracked-cache >../after &&
|
|
|
|
|
test_cmp ../before ../after
|
|
|
|
|
'
|
|
|
|
|
|
2015-03-08 11:12:44 +01:00
|
|
|
test_done
|