summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* submodule: add a test for a renamed submdoule dircmn/submodule-refactorCarlos Martín Nieto2015-09-101-0/+55
|
* submodule: refactor to be more explicit in the searchCarlos Martín Nieto2015-09-101-144/+219
| | | | | | | | | When searching for information about a submdoule, let's be more explicit in what we expect to find. We currently insert a submodule into the map and change certain parameters when the config callback gets called. Switch to asking for the configuration we're interested in, rather than taking it in an arbitrary order.
* Merge pull request #3379 from theseion/additional_libssh2_error_reportingCarlos Martín Nieto2015-09-091-1/+3
|\ | | | | report libssh2 error if list of authentication methods can't be retrieved
| * added a single line of additional error reporting from libssh2 when failing ↵Max Leske2015-08-141-1/+3
| | | | | | | | to retrieve the list of authentication methods
* | Merge pull request #3415 from ethomson/lock_hiddenCarlos Martín Nieto2015-09-092-0/+94
|\ \ | | | | | | filebuf: ensure we can lock a hidden file
| * | futils: ensure we can write a hidden fileEdward Thomson2015-09-081-0/+68
| | |
| * | filebuf: ensure we can lock a hidden fileEdward Thomson2015-09-081-0/+26
|/ /
* | Merge pull request #3410 from libgit2/cmn/ssh-embed-againEdward Thomson2015-09-081-2/+13
|\ \ | | | | | | Revert "Get rid of libssh2 embedding"
| * | Revert "Get rid of libssh2 embedding"cmn/ssh-embed-againCarlos Martín Nieto2015-09-031-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | The embedding was removed as a libssh2 release with Windows crypto support became available, but dependencies are still annoying so this ahs been requested again. This reverts commit 20dcb7315cd4c5760c68402998fd9e5a6bf5505d.
* | | Merge pull request #3353 from ethomson/wrongcase_addCarlos Martín Nieto2015-09-084-22/+318
|\ \ \ | | | | | | | | index: canonicalize directory case when adding
| * | | git_index_add: allow case changing renamesEdward Thomson2015-09-084-15/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 addingEdward Thomson2015-09-082-7/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #3381 from leoyanggit/index_directory_iteratorEdward Thomson2015-09-083-0/+56
|\ \ \ \ | |/ / / |/| | | New feature: add the ablility to iterate through a directory in index
| * | | New API: git_index_find_prefixLeo Yang2015-09-043-0/+56
| |/ / | | | | | | | | | Find the first index entry matching a prefix.
* | | Merge pull request #3413 from libgit2/cmn/follow-symlinkEdward Thomson2015-09-063-3/+137
|\ \ \ | | | | | | | | filebuf: follow symlinks when creating a lock file
| * | | filebuf: follow symlinks when creating a lock filecmn/follow-symlinkCarlos Martín Nieto2015-09-053-3/+137
| |/ / | | | | | | | | | | | | | | | | | | We create a lockfile to update files under GIT_DIR. Sometimes these files are actually located elsewhere and a symlink takes their place. In that case we should lock and update the file at its final location rather than overwrite the symlink.
* | | Merge pull request #3366 from libgit2/cmn/index-hashmapEdward Thomson2015-09-065-17/+227
|\ \ \ | |/ / |/| | Use a hashmap for path-based lookups in the index
| * | index: put the icase insert choice in macroscmn/index-hashmapCarlos Martín Nieto2015-09-041-25/+30
| | | | | | | | | | | | | | | This should let us see more clearly what we're doing and avoid the ugly 'if' we need every time we want to interact with the map.
| * | index: keep a hash table as well as a vector of entriesCarlos Martín Nieto2015-08-142-17/+96
| | | | | | | | | | | | | | | The hash table allows quick lookup of specific paths, while we use the vector for enumeration.
| * | index: add tests around case switchingCarlos Martín Nieto2015-08-142-0/+34
| | | | | | | | | | | | | | | We were missing tests for switching the case-sensitivity of an index in-memory and then looking up entries in it.
| * | Add a hashmap for index entriesCarlos Martín Nieto2015-08-141-0/+92
| | | | | | | | | | | | They are hashed case-insensitively and take the stage into account.
* | | config: correct documentation for non-existent config fileCarlos Martín Nieto2015-09-031-2/+4
| | |
* | | Merge pull request #3402 from ethomson/faster_diffCarlos Martín Nieto2015-09-0119-338/+1442
|\ \ \ | | | | | | | | Provide path matching in the iterators (for faster diffs)
| * | | iterator: better document GIT_DIFF_DISABLE_PATHSPEC_MATCHEdward Thomson2015-08-311-4/+6
| | | |
| * | | iterator test: handle case (in)sensitivityEdward Thomson2015-08-311-3/+26
| | | |
| * | | iterator test: use new iter opts in fifo testEdward Thomson2015-08-311-2/+5
| | | |
| * | | iterator: saner pathlist matching for idx iteratorEdward Thomson2015-08-314-86/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some nicer refactoring for index iteration walks. The index iterator doesn't binary search through the pathlist space, since it lacks directory entries, and would have to binary search each index entry and all its parents (eg, when presented with an index entry of `foo/bar/file.c`, you would have to look in the pathlist for `foo/bar/file.c`, `foo/bar` and `foo`). Since the index entries and the pathlist are both nicely sorted, we walk the index entries in lockstep with the pathlist like we do for other iteration/diff/merge walks.
| * | | diff: drop `FILELIST_MATCH`Edward Thomson2015-08-302-8/+1
| | | | | | | | | | | | | | | | | | | | Now that non-pathspec matching diffs are implemented at the iterator level, drop `FILELIST_MATCH`ing.
| * | | status test: brackets are now literalEdward Thomson2015-08-301-2/+2
| | | |
| * | | checkout: use pathlist-based iteratorsEdward Thomson2015-08-301-1/+7
| | | |
| * | | tree_iterator: use a pathlistEdward Thomson2015-08-302-1/+148
| | | |
| * | | diff: use new iterator pathlist handlingEdward Thomson2015-08-306-135/+246
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using literal pathspecs in diff with `GIT_DIFF_DISABLE_PATHSPEC_MATCH` turn on the faster iterator pathlist handling. Updates iterator pathspecs to include directory prefixes (eg, `foo/`) for compatibility with `GIT_DIFF_DISABLE_PATHSPEC_MATCH`.
| * | | diff: better document GIT_DIFF_PATHSPEC_DISABLEEdward Thomson2015-08-282-1/+213
| | | | | | | | | | | | | | | | | | | | | | | | Document that `GIT_DIFF_PATHSPEC_DISABLE` is not necessarily about explicit path matching, but also includes matching of directory names. Enforce this in a test.
| * | | iterator: sort subdirs properly with pathlistEdward Thomson2015-08-282-7/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When given a pathlist, don't assume that directories sort before files. Walk through any list of entries sorting before us to make sure that we've exhausted all entries that *aren't* directories. Eg, if we're searching for 'foo/bar', and we have a 'foo.c', keep advancing the pathlist to keep looking for an entry prefixed with 'foo/'.
| * | | racy-git: TODO to use improved diffingEdward Thomson2015-08-281-0/+1
| | | |
| * | | Move filelist into the iterator handling itself.Edward Thomson2015-08-286-23/+405
| | | |
| * | | iterator: use an options struct instead of argsEdward Thomson2015-08-2816-275/+423
| | | |
* | | | Merge pull request #3401 from phatblat/pb/doc-warningCarlos Martín Nieto2015-08-301-1/+1
|\ \ \ \ | | | | | | | | | | Escape @ in doc comment
| * | | | Escape @ in doc commentBen Chatelain2015-08-291-1/+1
| | | | |
* | | | | Merge pull request #3352 from ethomson/hiddenEdward Thomson2015-08-285-10/+105
|\ \ \ \ \ | |_|/ / / |/| | | | win32: ensure hidden files can be staged
| * | | | win32: ensure hidden files can be stagedEdward Thomson2015-08-035-10/+105
| | | | |
* | | | | Merge pull request #3399 from arthurschreiber/patch-8Edward Thomson2015-08-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Fix a typo [ci skip]
| * | | | | Fix a typo [ci skip]Arthur Schreiber2015-08-261-1/+1
|/ / / / /
* | | | | Merge pull request #3396 from ethomson/copyingCarlos Martín Nieto2015-08-251-0/+46
|\ \ \ \ \ | | | | | | | | | | | | COPYING: include winhttp definition copyright
| * | | | | COPYING: include winhttp definition copyrightEdward Thomson2015-08-251-0/+46
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | Include the copyright notice from the deps/winhttp/ sources. Move the LGPL to the bottom of the file (since multiple dependencies are LGPL licensed) and include the actual copyright notices from the regex sources.
* | | | | Merge pull request #3355 from palmin/palmin/fix-2830Carlos Martín Nieto2015-08-251-2/+9
|\ \ \ \ \ | | | | | | | | | | | | Include the 4 characters not recognised as hex-number in parse_len
| * | | | | Include the 4 characters not recognised as hex-number when setting error in ↵Anders Borum2015-08-171-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | parse_len
* | | | | | Merge pull request #3388 from libgit2/cmn/smart-callbacksCarlos Martín Nieto2015-08-204-0/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | transport: provide a way to get the callbacks
| * | | | | | cred: add a free function wrappercmn/smart-callbacksCarlos Martín Nieto2015-08-192-0/+19
| | | | | | |
| * | | | | | transport: provide a way to get the callbacksCarlos Martín Nieto2015-08-192-0/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | libgit2 implementations of smart subtransports can simply reach through the structure, but external implementors cannot. Add these two functions as a way for the smart subtransports to get the callbacks as set by the user.