delta/git.git, branch cc/untracked

update-index: fix xgetcwd() related memory leak

2017-03-30T17:33:31+00:00

As xgetcwd() returns an allocated buffer, we should free this
buffer when we don't need it any more.

This was found by Coverity.

Reported-by: Jeff King 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

t7063: add tests for core.untrackedCache

2016-01-27T20:30:17+00:00

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

test-dump-untracked-cache: don't modify the untracked cache

2016-01-27T20:30:07+00:00

To correctly perform its testing function,
test-dump-untracked-cache should not change the state of the
untracked cache in the index.

As a previous patch makes read_index_from() change the state of
the untracked cache and as test-dump-untracked-cache indirectly
calls this function, we need a mechanism to prevent
read_index_from() from changing the untracked cache state when
it's called from test-dump-untracked-cache.

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

config: add core.untrackedCache

2016-01-27T20:30:00+00:00

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 
Helped-by: Torsten Bögershausen 
Helped-by: Stefan Beller 
Signed-off-by: Christian Couder 
Signed-off-by: Ævar Arnfjörð Bjarmason 

read-cache: Duy'sfixup

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

dir: simplify untracked cache "ident" field

2016-01-25T20:40:17+00:00

It is not a good idea to compare kernel versions and disable
the untracked cache if it changes, as people may upgrade and
still want the untracked cache to work. So let's just
compare work tree locations and kernel name to decide if we
should disable it.

Also storing many locations in the ident field and comparing
to any of them can be dangerous if GIT_WORK_TREE is used with
different values. So let's just store one location, the
location of the current work tree.

The downside is that untracked cache can only be used by one
type of OS for now. Exporting a git repo to different clients
via a network to e.g. Linux and Windows means that only one
can use the untracked cache.

If the location changed in the ident field and we still want
an untracked cache, let's delete the cache and recreate it.

Note that if an untracked cache has been created by a
previous Git version, then the kernel version is stored in
the ident field. As we now compare with just the kernel
name the comparison will fail and the untracked cache will
be disabled until it's recreated.

Helped-by: Torsten Bögershausen 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

dir: add remove_untracked_cache()

2016-01-25T20:40:11+00:00

Factor out code into remove_untracked_cache(), which will be used
in a later commit.

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

dir: add {new,add}_untracked_cache()

2016-01-25T20:39:58+00:00

Factor out code into new_untracked_cache() and
add_untracked_cache(), which will be used
in later commits.

Helped-by: Eric Sunshine 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

update-index: move 'uc' var declaration

2016-01-25T20:39:46+00:00

Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

update-index: add untracked cache notifications

2016-01-25T20:39:34+00:00

Attempting to flip the untracked-cache feature on for a random index
file with

    cd /random/unrelated/place
    git --git-dir=/somewhere/else/.git update-index --untracked-cache

would not work as you might expect. Because flipping the feature on
in the index also records the location of the corresponding working
tree (/random/unrelated/place in the above example), when the index
is subsequently used to keep track of files in the working tree in
/somewhere/else, the feature is disabled.

With this patch "git update-index --[test-]untracked-cache" tells the
user in which directory tests are performed. This makes it easy to
spot any problem.

Also in verbose mode, let's tell the user when the cache is enabled
or disabled.

Helped-by: Duy Nguyen 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano

update-index: add --test-untracked-cache

2016-01-25T20:39:22+00:00

It is nice to just be able to test if untracked cache is
supported without enabling it.

Helped-by: David Turner 
Signed-off-by: Christian Couder 
Signed-off-by: Junio C Hamano