summaryrefslogtreecommitdiff
path: root/include/git2/index.h
Commit message (Collapse)AuthorAgeFilesLines
...
* Index: API uniformisation: Use unsigned int for all index number.Romain Geissler2011-06-051-2/+14
| | | | | Feature Added: Search an unmerged entry by path (git_index_get_unmerged renamed to git_index_get_unmerged_bypath) or by index (git_index_get_unmerged_byindex).
* index: Add `git_index_entry_stage` methodVicent Marti2011-06-031-0/+12
| | | | As suggested by Romain-Geissler
* index: Change the memory management for repo indexesVicent Marti2011-06-011-15/+10
| | | | | The `git_repository_index` call now returns a brand new index that must be manually free'd.
* index: Fix issues in the unmerged entries APIVicent Marti2011-05-191-6/+10
|
* Merge branch 'development' into unmergedJakob Pfender2011-05-171-32/+63
|\
| * Fix misspelling of git_index_append2 (was git_index_apppend2).Jason R. McNeil2011-05-031-2/+2
| |
| * Re-apply missing patchesVicent Marti2011-05-021-23/+13
| |
| * index: Refactor add/replace methodsVicent Marti2011-04-241-10/+50
| | | | | | | | | | | | | | | | | | | | | | Removed the optional `replace` argument, we now have 4 add methods: `git_index_add`: add or update from path `git_index_add2`: add or update from struct `git_index_append`: add without replacing from path `git_index_append2`: add without replacing from struct Yes, this breaks the bindings.
| * index: Allow user to toggle whether to replace an index entryJakob Pfender2011-04-211-4/+5
| | | | | | | | | | When in the middle of a merge, the index needs to contain several files with the same name. git_index_insert() used to prevent this by not adding a new entry if an entry with the same name already existed.
* | index: Add API for unmerged entriesJakob Pfender2011-04-211-0/+24
|/ | | | | | | | | | | | | | | | | | | | | | New external functions: - git_index_unmerged_entrycount: Counts the unmerged entries in the index - git_index_get_unmerged: Gets an unmerged entry from the index by name New internal functions: - read_unmerged: Wrapper for read_unmerged_internal - read_unmerged_internal: Reads unmerged entries from the index if the index has the INDEX_EXT_UNMERGED_SIG set - unmerged_srch: Search function for unmerged vector - unmerged_cmp: Compare function for unmerged vector New data structures: - git_index now contains a git_vector unmerged that stores unmerged entries - git_index_entry_unmerged: Representation of an unmerged file entry. It represents all three versions of the file at the same time, with one name, three modes and three OIDs
* index.h: Add IDXENTRY flags needed for index operationsJakob Pfender2011-04-081-0/+40
| | | | | Add several IDXENTRY flags that need to be checked in order to properly implement update-index --refresh.
* index.h: Fix minor typoJakob Pfender2011-03-251-1/+1
|
* index.h: Correct documentation for git_index_open_inrepo()Jakob Pfender2011-03-251-1/+1
| | | | | | Fix the doxygen comments for git_index_open_inrepo(). Previously they referred to a param index_path and omitted index (probably a c&p error).
* Move the external includes folder from `src` to `include`Vicent Marti2011-03-031-0/+199
Signed-off-by: Vicent Marti <tanoku@gmail.com>
View Lorry Controller Status