delta/libgit2.git/src/submodule.c, branch ethomson/read_prefix

Merge pull request #4163 from pks-t/pks/submodules-with-worktrees

2017-03-22T20:32:55+00:00

Worktree fixes

submodule: resolve URLs relative to main worktree

2017-03-17T08:27:56+00:00

It is possible to specify submodule URLs relative to the repository
location. E.g. having a submodule with URL "../submodule" will look for
the submodule at "repo/../submodule".

With the introduction of worktrees, though, we cannot simply resolve the
URL relative to the repository location itself. If the repository for
which a URL is to be resolved is a working tree, we have to resolve the
URL relative to the parent's repository path. Otherwise, the URL would
change depending on where the working tree is located.

Fix this by special-casing when we have a working tree while getting the
URL base.

submodule: catch when submodule is not staged on update

2017-03-14T13:53:32+00:00

When calling `git_submodule_update` on a submodule, we have to retrieve
the ID of the submodule entry in the index. If the function is called on
a submodule which is only partly initialized, the submodule entry may
not be added to the index yet. This leads to an assert when trying to
look up the blob later on.

Fix the issue by checking if the index actually holds the submodule's
ID and erroring out if it does not.

khash: avoid using macro magic to get return address

2017-02-17T10:41:06+00:00

khash: avoid using `kh_put` directly

2017-02-17T10:41:06+00:00

khash: avoid using `kh_size` directly

2017-02-17T10:41:06+00:00

repository: use `git_repository_item_path`

2017-02-13T09:28:15+00:00

The recent introduction of the commondir variable of a repository
requires callers to distinguish whether their files are part of
the dot-git directory or the common directory shared between
multpile worktrees. In order to take the burden from callers and
unify knowledge on which files reside where, the
`git_repository_item_path` function has been introduced which
encapsulate this knowledge.

Modify most existing callers of `git_repository_path` to use
`git_repository_item_path` instead, thus making them implicitly
aware of the common directory.

Fix uninitialized variable warning

2017-01-27T17:49:48+00:00

Fix the following warning emitted by clang:
[ 16%] Building C object CMakeFiles/libgit2_clar.dir/src/submodule.c.o
/Users/mplough/devel/external/libgit2/src/submodule.c:408:6: warning: variable 'i' is used uninitialized whenever 'if' condition is true
      [-Wsometimes-uninitialized]
        if ((error = load_submodule_names(names, cfg)))
            ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/mplough/devel/external/libgit2/src/submodule.c:448:20: note: uninitialized use occurs here
        git_iterator_free(i);
                          ^
/Users/mplough/devel/external/libgit2/src/submodule.c:408:2: note: remove the 'if' if its condition is always false
        if ((error = load_submodule_names(names, cfg)))
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
/Users/mplough/devel/external/libgit2/src/submodule.c:404:17: note: initialize the variable 'i' to silence this warning
        git_iterator *i;
                       ^
                        = NULL
1 warning generated.

submodule: only examine idx & head given a config

2017-01-23T22:29:57+00:00

submodule: don't double free during load failure

2017-01-23T22:24:40+00:00

When we fail to load submodules, don't free the list; it is later freed
unconditionally.