delta/libgit2.git/tests/index, branch cmn/programdata-config github.com: libgit2/libgit2.git index: also try conflict mode when inserting 2015-09-30T13:06:09+00:00 Edward Thomson ethomson@microsoft.com 2015-09-29T19:49:16+00:00 21515f228b739a3ecd2237bafbba50e8d219d8dd When we do not trust the on-disk mode, we use the mode of an existing index entry. This allows us to preserve executable bits on platforms that do not honor them on the filesystem. If there is no stage 0 index entry, also look at conflicts to attempt to answer this question: prefer the data from the 'ours' side, then the 'theirs' side before falling back to the common ancestor. 
When we do not trust the on-disk mode, we use the mode of an existing
index entry.  This allows us to preserve executable bits on platforms
that do not honor them on the filesystem.

If there is no stage 0 index entry, also look at conflicts to attempt
to answer this question:  prefer the data from the 'ours' side, then
the 'theirs' side before falling back to the common ancestor.
index: test that add_bypath preserves mode 2015-09-29T18:16:51+00:00 Edward Thomson ethomson@microsoft.com 2015-09-29T18:16:51+00:00 10df661b8cd2a7e4751f8344633825dfc88be169 






Plug some leaks
2015-09-27T21:32:20+00:00

Carlos Martín Nieto
cmn@dwim.me

2015-09-27T21:32:20+00:00

5c5df666b0b2ed4433c6fb931280f9641e967a13












git_futils_mkdir_*: make a relative-to-base mkdir
2015-09-17T14:00:35+00:00

Edward Thomson
ethomson@microsoft.com

2015-09-16T19:07:27+00:00

ac2fba0ecd68e8eae348dec688cbcd0828432cdf

Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter
assumes that we own everything beneath the base, as if it were
being called with a base of the repository or working directory,
and is tailored towards checkout and ensuring that there is no
bogosity beneath the base that must be cleaned up.

This is (at best) slow and (at worst) unsafe in the larger context
of a filesystem where we do not own things and cannot do things like
unlink symlinks that are in our way.





Untangle git_futils_mkdir from git_futils_mkdir_ext - the latter
assumes that we own everything beneath the base, as if it were
being called with a base of the repository or working directory,
and is tailored towards checkout and ensuring that there is no
bogosity beneath the base that must be cleaned up.

This is (at best) slow and (at worst) unsafe in the larger context
of a filesystem where we do not own things and cannot do things like
unlink symlinks that are in our way.







Merge pull request #3353 from ethomson/wrongcase_add
2015-09-08T16:34:51+00:00

Carlos Martín Nieto
cmn@dwim.me

2015-09-08T16:34:51+00:00

6d6020defcb17ec0c4836db428f148ebaedabe65

index: canonicalize directory case when adding




index: canonicalize directory case when adding






Merge pull request #3381 from leoyanggit/index_directory_iterator
2015-09-08T15:50:08+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-09-08T15:50:08+00:00

2964cbeae14f52a42f82b5bf6fbb22cfcb5bd4c9

New feature: add the ablility to iterate through a directory in index




New feature: add the ablility to iterate through a directory in index






git_index_add: allow case changing renames
2015-09-08T15:34:00+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-08-07T17:43:49+00:00

a32bc85e84090299ab9ba56b2d8f1761b7d91873

On case insensitive platforms, allow `git_index_add` to provide a new
path for an existing index entry.  Previously, we would maintain the
case in an index entry without the ability to change it (except by
removing an entry and re-adding it.)

Higher-level functions (like `git_index_add_bypath` and
`git_index_add_frombuffers`) continue to keep the old path for easier
usage.





On case insensitive platforms, allow `git_index_add` to provide a new
path for an existing index entry.  Previously, we would maintain the
case in an index entry without the ability to change it (except by
removing an entry and re-adding it.)

Higher-level functions (like `git_index_add_bypath` and
`git_index_add_frombuffers`) continue to keep the old path for easier
usage.







index: canonicalize directory case when adding
2015-09-08T15:32:40+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-08-04T21:51:00+00:00

280adb3f942a1ce4f4939b7058209d0cd0467062

On case insensitive systems, when given a user-provided path in the
higher-level index addition functions (eg `git_index_add_bypath` /
`git_index_add_frombuffer`), examine the index to try to match the
given path to an existing directory.

Various mechanisms can cause the on-disk representation of a folder
to not match the representation in HEAD or the index - for example,
a case changing rename of some file `a/file.txt` to `A/file.txt`
will update the paths in the index, but not rename the folder on
disk.

If a user subsequently adds `a/other.txt`, then this should be stored
in the index as `A/other.txt`.





On case insensitive systems, when given a user-provided path in the
higher-level index addition functions (eg `git_index_add_bypath` /
`git_index_add_frombuffer`), examine the index to try to match the
given path to an existing directory.

Various mechanisms can cause the on-disk representation of a folder
to not match the representation in HEAD or the index - for example,
a case changing rename of some file `a/file.txt` to `A/file.txt`
will update the paths in the index, but not rename the folder on
disk.

If a user subsequently adds `a/other.txt`, then this should be stored
in the index as `A/other.txt`.







Merge pull request #3366 from libgit2/cmn/index-hashmap
2015-09-06T14:50:22+00:00

Edward Thomson
ethomson@edwardthomson.com

2015-09-06T14:50:22+00:00

9fd4c9c8679d166e73ca7c5594cd05c693a5ab10

Use a hashmap for path-based lookups in the index




Use a hashmap for path-based lookups in the index






New API: git_index_find_prefix
2015-09-04T16:24:36+00:00

Leo Yang
lyang@topologyinc.com

2015-08-17T19:02:02+00:00

c097f7173daced0f86fd816a72ad5fc0f636484a

Find the first index entry matching a prefix.





Find the first index entry matching a prefix.