summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1385 from carlosmn/refs-iterEdward Thomson2013-05-113-35/+77
|\ | | | | Introduce a refs iterator
| * Introduce a glob-filtering iteratorCarlos Martín Nieto2013-05-111-1/+13
| | | | | | | | | | If the backend doesn't provide support for it, the matching is done in refdb on top of a normal iterator.
| * refs: remove the OID/SYMBOLIC filteringCarlos Martín Nieto2013-05-112-42/+8
| | | | | | | | | | | | | | | | | | Nobody should ever be using anything other than ALL at this level, so remove the option altogether. As part of this, git_reference_foreach_glob is now implemented in the frontend using an iterator. Backends will later regain the ability of doing the glob filtering in the backend.
| * refs: introduce an iteratorCarlos Martín Nieto2013-05-113-0/+64
| | | | | | | | This allows us to get a list of reference names in a loop instead of callbacks.
* | Fix git_repository_message docsRussell Belfer2013-05-091-2/+11
| | | | | | | | | | | | | | | | This clarifies the docs for git_repository_message and also adds to the tests to explicitly check NUL termination of data when the output buffer is smaller than the message size. There is a minor behavior change so that a non-NULL output buffer will always be NUL terminated (at length zero) if an error occurs.
* | Merge pull request #1560 from carlosmn/ref-dwimVicent Martí2013-05-091-0/+13
|\ \ | | | | | | Expose git_reference_dwim
| * | Expose git_reference_dwimCarlos Martín Nieto2013-05-071-0/+13
| | | | | | | | | | | | | | | Extract this function out of the rev-parse code to be able to DWIM a reference instead of its target.
* | | Merge pull request #1552 from carlosmn/config-helpersVicent Martí2013-05-071-0/+15
|\ \ \ | | | | | | | | Config helpers for global/xdg config files
| * | | config: convenience function to open global/xdgCarlos Martín Nieto2013-05-071-0/+15
| |/ / | | | | | | | | | | | | The rules for which one to open is a bit silly, so let's make it easier for our users.
* | | Merge pull request #1556 from arrbee/diff-patch-fixesVicent Martí2013-05-071-9/+30
|\ \ \ | | | | | | | | Diff patch bug fixes
| * | | Improve diff function docsRussell Belfer2013-05-071-7/+26
| | | |
| * | | Add GIT_DIFF_LINE_CONTEXT_EOFNLRussell Belfer2013-05-071-2/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new line origin constant for the special line that is used when both files end without a newline. In the course of writing the tests for this, I was having problems with modifying a file but not having diff notice because it was the same size and modified less than one second from the start of the test, so I decided to start working on nanosecond timestamp support. This commit doesn't contain the nanosecond support, but it contains the reorganization of maybe_modified and the hooks so that if the nanosecond data were being read by stat() (or rather being copied by git_index_entry__init_from_stat), then the nsec would be taken into account. This new stuff could probably use some more tests, although there is some amount of it here.
* | | Add git_commit_owner to the public interfaceJ. David Ibáñez2013-05-071-0/+8
|/ / | | | | | | Just like git_tree_owner, etc.
* | Merge pull request #1545 from ethomson/checkout_dirs_in_useVicent Martí2013-05-061-0/+3
|\ \ | | | | | | allow checkout to proceed when a dir to be removed is in use (win32)
| * | allow checkout to proceed when a dir to be removed is in use (win32)Edward Thomson2013-05-031-0/+3
| |/
* | branch.h: fix typo in docsNikolai Vladimirov2013-05-061-1/+1
| |
* | commit: make create_from_oids() accept plain oidnulltoken2013-05-051-2/+3
|/
* Merge pull request #1389 from ethomson/merge_treesVicent Martí2013-05-013-108/+252
|\ | | | | Merge trees
| * move NAME and REUC extensions to sys/Edward Thomson2013-04-302-156/+180
| |
| * renames!Edward Thomson2013-04-302-0/+66
| |
| * merge!Edward Thomson2013-04-302-8/+62
| |
* | Merge pull request #1523 from libgit2/vmg/namespacesVicent Martí2013-05-011-0/+22
|\ \ | |/ |/| Namespace support
| * lol namespacesvmg/namespacesVicent Marti2013-04-301-0/+22
| |
* | Update comment for clarityRussell Belfer2013-04-301-5/+17
| |
* | Update diff handling of untracked directoriesRussell Belfer2013-04-302-14/+21
|/ | | | | | | | | | When diff encounters an untracked directory, there was a shortcut that it took which is not compatible with core git. This makes the default behavior no longer take that shortcut and instead look inside the untracked directory to see if there are any untracked files within it. If there are not, then the directory is treated as an ignore directory instead of an untracked directory. This has implications for the git_status APIs.
* object: Explicitly define helper API methods for all obj typesVicent Marti2013-04-301-16/+4
|
* Merge pull request #1518 from arrbee/export-oid-comparisonVicent Martí2013-04-304-63/+40
|\ | | | | Remove most inlines from the public API
| * Some cleanupsRussell Belfer2013-04-291-9/+0
| | | | | | | | | | Removed useless prototype and renamed object typecast functions declaration macro.
| * Standardize cast versions of git_object accessorsRussell Belfer2013-04-293-50/+29
| | | | | | | | | | | | This removes the GIT_INLINE versions of the simple git_object accessors and standardizes them with a helper macro in src/object.h to build the function bodies.
| * Make git_oid_cmp public and add git_oid__cmpRussell Belfer2013-04-291-13/+1
| |
| * Add git_oid_strcmp and use it for git_oid_streqRussell Belfer2013-04-291-0/+10
| | | | | | | | | | | | | | | | Add a new git_oid_strcmp that compares a string OID with a hex oid for sort order, and then reimplement git_oid_streq using it. This actually should speed up git_oid_streq because it only reads as far into the string as it needs to, whereas previously it would convert the whole string into an OID and then use git_oid_cmp.
| * Introduce git_oid_compare, an exported oid cmpRussell Belfer2013-04-291-0/+9
| |
* | remote: add resfpec list accessorsCarlos Martín Nieto2013-04-302-0/+27
| | | | | | | | | | | | Bring back a way of acessing the git_refspec* from a remote. Closes #1514
* | refspec: add direction accessorCarlos Martín Nieto2013-04-301-0/+8
| |
* | Parse shorthand refspecs as validCarlos Martín Nieto2013-04-281-0/+7
|/ | | | | Relax the ONELEVEL ref naming rules so the refspec parsing code can ask for 'master' to be considered valid.
* docs: formatting fixesCarlos Martín Nieto2013-04-243-26/+34
|
* repo: Add `git_repository__cleanup`Vicent Marti2013-04-241-0/+14
|
* Merge pull request #1502 from nvloff/remote_refspecs_minor_fixesVicent Martí2013-04-231-9/+0
|\ | | | | Remote refspecs minor fixes
| * remove git_remote_pushspecNikolai Vladimirov2013-04-231-9/+0
| |
* | Merge pull request #1498 from libgit2/vmg/atomic64Vicent Martí2013-04-231-1/+2
|\ \ | | | | | | 64 bit atomic operations and shared cache memory usage
| * | opts: Add getter for cached memoryvmg/atomic64Vicent Marti2013-04-231-1/+2
| | |
* | | Merge pull request #1501 from xavier-l/packbuilder-commitVicent Martí2013-04-231-0/+12
|\ \ \ | |_|/ |/| | Added function to insert commit into pack
| * | Added function to insert commit into packXavier L2013-04-231-0/+12
| |/
* | Document the odb backend constructorsCarlos Martín Nieto2013-04-231-1/+33
|/
* cache: Max cache size, and evict when the cache fills upvmg/new-cacheVicent Marti2013-04-221-1/+2
|
* Global option settersVicent Marti2013-04-221-0/+2
|
* No longer neededVicent Marti2013-04-221-11/+0
|
* Merge pull request #1493 from carlosmn/remotesVicent Martí2013-04-222-10/+41
|\ | | | | Revamp the refspec handling
| * refspec: unify the string and parsed dataCarlos Martín Nieto2013-04-201-0/+8
| | | | | | | | | | | | | | | | It used to be separate as an attempt to make the querying easier, but it didn't work out that way, so put all the data together. Add git_refspec_string() as well to get the original string, which is now stored alongside the independent parts.
| * remote: allow querying for refspecsCarlos Martín Nieto2013-04-201-2/+24
| | | | | | | | | | | | | | | | Introduce git_remote_{fetch,push}_refspecs() to get a list of refspecs from the remote and rename the refspec-adding functions to a less silly name. Use this instead of the vector index hacks in the tests.
View Lorry Controller Status