summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* More external API cleanupmore-api-tweaksVicent Marti2012-11-178-52/+78
|
* reflog: make entry_byindex() and drop() git compliantnulltoken2012-11-171-3/+8
| | | | | Passing 0 as the index now retrieves the most recent entry instead of the oldest one.
* reflog: Fix documentationnulltoken2012-11-171-1/+2
|
* config: Opening a nonexistent file returns ENOTFOUNDnulltoken2012-11-171-5/+6
|
* config: Make git_config_file__ondisk() internalnulltoken2012-11-171-13/+0
|
* repo: ensure is_empty() checks there are no refsnulltoken2012-11-171-1/+1
|
* tag: rename git_tag_type to git_tag_target_typenulltoken2012-11-171-1/+1
|
* Merge pull request #1074 from edubart/ignore_diff_filemodeVicent Martí2012-11-151-0/+2
|\ | | | | Add option to ignore file mode in diffs
| * Add option to ignore file mode in diffsEduardo Bart2012-11-151-0/+2
| |
* | Add explicit git_index ptr to diff and checkoutRussell Belfer2012-11-142-1/+7
| | | | | | | | | | | | | | | | A number of diff APIs and the `git_checkout_index` API take a `git_repository` object an operate on the index. This updates them to take a `git_index` pointer explicitly and only fall back on the `git_repository` index if the index input is NULL. This makes it easier to operate on a temporary index.
* | Fix diff API to better parameter orderRussell Belfer2012-11-141-17/+17
|/ | | | | The diff API is not in the parameter order one would expect from other libgit2 APIs. This fixes that.
* Merge pull request #1016 from arrbee/fix-checkout-dir-removalVicent Martí2012-11-132-29/+131
|\ | | | | Update checkout with new strategies & behavior
| * Fix various cross-platform build issuesRussell Belfer2012-11-091-5/+9
| | | | | | | | | | | | This fixes a number of warnings and problems with cross-platform builds. Among other things, it's not safe to name a member of a structure "strcmp" because that may be #defined.
| * Rework checkout with new strategy optionsRussell Belfer2012-11-092-29/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a major reworking of checkout strategy options. The checkout code is now sensitive to the contents of the HEAD tree and the new options allow you to update the working tree so that it will match the index content only when it previously matched the contents of the HEAD. This allows you to, for example, to distinguish between removing files that are in the HEAD but not in the index, vs just removing all untracked files. Because of various corner cases that arise, etc., this required some additional capabilities in rmdir and other utility functions. This includes the beginnings of an implementation of code to read a partial tree into the index based on a pathspec, but that is not enabled because of the possibility of creating conflicting index entries.
* | config: rename get_config_entry -> config_entryCarlos Martín Nieto2012-11-131-1/+1
| | | | | | | | | | We're already in the git_config namespace, there is no need to repeat it.
* | move hash library func ptrs to global globalEdward Thomson2012-11-131-1/+3
| |
* | repository: Refine repository_head() error reportnulltoken2012-11-121-1/+1
| |
* | create FETCH_HEAD specially instead of as a ref fileEdward Thomson2012-11-111-0/+17
| |
* | Merge pull request #1056 from nulltoken/duplicate-tree-entriesVicent Martí2012-11-101-2/+15
|\ \ | |/ |/| Duplicate tree entries
| * index: prevent tree creation from a non merged statenulltoken2012-11-091-2/+8
| | | | | | | | Fix libgit2/libgit2sharp#243
| * index: Introduce git_index_has_conflicts()nulltoken2012-11-081-0/+7
| |
* | Update documentation in remote.hBrian Schroeder2012-11-081-4/+11
|/
* Merge pull request #1048 from pwkelley/basic_authPhilip Kelley2012-11-082-1/+65
|\ | | | | Basic authentication for http and winhttp
| * Basic authentication for http and winhttpPhilip Kelley2012-11-062-1/+65
| |
* | create callback to handle packs from fetch, move the indexer to odb_packEdward Thomson2012-11-053-5/+45
|/
* Merge pull request #1034 from carlosmn/packbuilder-foreachVicent Martí2012-11-051-0/+24
|\ | | | | Let the user grab the packfile as it's being written
| * packbuilder: add accessors for the number of total and written objectsCarlos Martín Nieto2012-11-011-0/+14
| |
| * packbuilder: add git_packbuilder_foreachCarlos Martín Nieto2012-11-011-0/+10
| | | | | | | | | | Let the user get each object as a buffer+size pair so they can handle the packfile content as they need to.
* | Merge pull request #1014 from arrbee/diff-rename-detectionVicent Martí2012-11-021-7/+63
|\ \ | | | | | | Initial implementation of diff rename detection
| * | Move rename detection into new fileRussell Belfer2012-10-301-18/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This improves the naming for the rename related functionality moving it to be called `git_diff_find_similar()` and renaming all the associated constants, etc. to make more sense. I also moved the new code (plus the existing `git_diff_merge`) into a new file `diff_tform.c` where I can put new functions related to manipulating git diff lists. This also updates the implementation significantly from the last revision fixing some ordering issues (where break-rewrite needs to be handled prior to copy and rename detection) and improving config option handling.
| * | Initial implementation of diff rename detectionRussell Belfer2012-10-231-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements the basis for diff rename and copy detection, although it is based on simple SHA comparison right now instead of using a matching algortihm. Just as `git_diff_merge` can be used as a post-pass on diffs to emulate certain command line behaviors, there is a new API `git_diff_detect` which will update a diff list in-place, adjusting some deltas to RENAMED or COPIED state (and also, eventually, splitting MODIFIED deltas where the change is too large into DELETED/ADDED pairs). This also adds a new test repo that will hold rename/copy/split scenarios. Right now, it just has exact-match rename and copy, but the tests are written to use tree diffs, so we should be able to add new test scenarios easily without breaking tests.
* | | Merge pull request #1038 from arrbee/doc-fixesVicent Martí2012-11-012-172/+239
|\ \ \ | | | | | | | | Improve docs, examples, warnings
| * | | Improve docs, examples, warningsRussell Belfer2012-11-012-172/+239
| | | | | | | | | | | | | | | | | | | | | | | | This improves docs in some of the public header files, cleans up and improves some of the example code, and fixes a couple of pedantic warnings in places.
* | | | index: Add `git_index_new`index-open-cleanupVicent Marti2012-11-011-0/+13
| | | |
* | | | index: Add git_index_write_treeVicent Marti2012-11-012-18/+32
|/ / /
* | | Merge pull request #1030 from pwkelley/transportsVicent Martí2012-11-012-1/+271
|\ \ \ | | | | | | | | Reorganize transport architecture
| * | | Reorganize transport architecture (squashed 3)Philip Kelley2012-11-012-1/+271
| | | |
* | | | Add git_config_refresh() API to reload configRussell Belfer2012-10-301-0/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new API that allows users to reload the config if the file has changed on disk. A new config callback function to refresh the config was added. The modified time and file size are used to test if the file needs to be reloaded (and are now stored in the disk backend object). In writing tests, just using mtime was a problem / race, so I wanted to check file size as well. To support that, I extended `git_futils_readbuffer_updated` to optionally check file size in addition to mtime, and I added a new function `git_filebuf_stats` to fetch the mtime and size for an open filebuf (so that the config could be easily refreshed after a write). Lastly, I moved some similar file checking code for attributes into filebuf. It is still only being used for attrs, but it seems potentially reusable, so I thought I'd move it over.
* | | Merge pull request #1017 from arrbee/diff-patch-to-strVicent Martí2012-10-301-0/+28
|\ \ \ | | | | | | | | Add git_diff_patch_to_str API
| * | | Add git_diff_patch_printRussell Belfer2012-10-251-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a `git_diff_patch_print()` API which is more like the existing API to "print" a patch from an entire `git_diff_list` but operates on a single `git_diff_patch` object. Also, it rewrites the `git_diff_patch_to_str()` API to use that function (making it very small).
| * | | Add git_diff_patch_to_str APIRussell Belfer2012-10-241-0/+11
| | | | | | | | | | | | | | | | | | | | This adds an API to generate a complete single-file patch text from a git_diff_patch object.
* | | | Merge pull request #1026 from nulltoken/repo/stateVicent Martí2012-10-301-0/+6
|\ \ \ \ | | | | | | | | | | repo: enhance git_repository_state() detection
| * | | | repo: enhance git_repository_state() detectionnulltoken2012-10-271-0/+6
| | |/ / | |/| |
* | | | index refactoringEdward Thomson2012-10-291-88/+208
| | | |
* | | | stash: add git_stash_drop()nulltoken2012-10-261-0/+15
| | | |
* | | | stash: add git_stash_foreach()nulltoken2012-10-261-0/+40
| | | |
* | | | stash: add git_stash_save()nulltoken2012-10-261-0/+67
| | | |
* | | | error: add GITERR_STASH error typenulltoken2012-10-261-0/+1
| | | |
* | | | index: introduce git_index_owner()nulltoken2012-10-261-0/+8
| | | |
* | | | reflog: fix documentation typosnulltoken2012-10-261-3/+3
|/ / /