summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' into gsoc-pushfeatures/push_oldMichael Schubert2012-10-242-25/+163
|\
| * Fix example in commentIgnacio Casal Quinteiro2012-10-241-1/+1
| |
| * Add config level support in the config APIyorah2012-10-231-24/+162
| | | | | | | | | | | | | | Added `struct git_config_entry`: a git_config_entry contains the key, the value, and the config file level from which a config element was found. Added `git_config_open_level`: build a single-level focused config object from a multi-level one. We are now storing `git_config_entry`s in the khash of the config_file
* | push: deny non-fast-forward pushesMichael Schubert2012-10-241-0/+1
| |
* | push: add report-status capabilityMichael Schubert2012-10-241-0/+21
| |
* | gsoc-push WIPMichael Schubert2012-10-213-0/+66
| |
* | http: add support for basic authenticationMichael Schubert2012-10-201-0/+9
| |
* | object: add git_object_oid2typeMichael Schubert2012-10-201-0/+8
|/
* repository: TypoVicent Marti2012-10-191-1/+1
|
* errors: deploy GIT_EORPHANEDHEAD usagenulltoken2012-10-192-3/+6
|
* errors: introduce GIT_EORPHANEDHEADnulltoken2012-10-191-0/+1
|
* remote: support fetch cancelationCarlos Martín Nieto2012-10-181-0/+8
| | | | | | Introduce git_remote_stop() which sets a variable that is checked by the fetch process in a few key places. If this is variable is set, the fetch is aborted.
* Merge pull request #968 from arrbee/diff-support-typechangeRussell Belfer2012-10-174-43/+93
|\ | | | | Support TYPECHANGE records in status and adjust checkout accordingly
| * Move enum comments next to actual valuesRussell Belfer2012-10-092-65/+66
| |
| * Add complex checkout test and then fix checkoutRussell Belfer2012-10-093-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This started as a complex new test for checkout going through the "typechanges" test repository, but that revealed numerous issues with checkout, including: * complete failure with submodules * failure to create blobs with exec bits * problems when replacing a tree with a blob because the tree "example/" sorts after the blob "example" so the delete was being processed after the single file blob was created This fixes most of those problems and includes a number of other minor changes that made it easier to do that, including improving the TYPECHANGE support in diff/status, etc.
| * Cleanup TYPECHANGE supportRussell Belfer2012-10-091-0/+24
| | | | | | | | | | | | This is just some cleanup code, rearranging some of the checkout code where TYPECHANGE support was added and adding some comments to the diff header regarding the constants.
| * Introduce status/diff TYPECHANGE flagsRussell Belfer2012-10-092-11/+16
| | | | | | | | | | | | | | | | When I wrote the diff code, I based it on core git's diff output which tends to split a type change into an add and a delete. But core git's status has the notion of a T (typechange) flag for a file. This introduces that into our status APIs and modifies the diff code so it can be forced to not split type changes.
* | Merge pull request #972 from PaulThompson/separate_strarrayBen Straub2012-10-176-9/+59
|\ \ | | | | | | Separated git_strarray from common.h. Added doxy comments.
| * | Separated git_strarray from common.h. Added doxy comments.Paul Thompson2012-10-116-9/+59
| | |
* | | Merge pull request #952 from csware/config-locationsVicent Martí2012-10-161-0/+20
|\ \ \ | | | | | | | | Config location fixes
| * | | Rename xdr to xdgSven Strickroth2012-10-021-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | | Correctly read xdr compatible %HOME%/.config/git/config config fileSven Strickroth2012-09-241-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This file is not just read if the global config file (%HOME%/.gitconfig) is not found, however, it is used everytime but with lower priority. Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | | Merge pull request #984 from arrbee/fix-fnmatch-and-ignorePhilip Kelley2012-10-162-7/+12
|\ \ \ \ | | | | | | | | | | Fix single file ignores
| * | | | Fix single-file ignore checksRussell Belfer2012-10-152-7/+12
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | To answer if a single given file should be ignored, the path to that file has to be processed progressively checking that there are no intermediate ignored directories in getting to the file in question. This enables that, fixing the broken old behavior, and adds tests to exercise various ignore situations.
* | | | clone: Explicit support of no-checkout optionnulltoken2012-10-151-3/+6
|/ / /
* | | gsoc-pack-objects WIPMichael Schubert2012-10-093-0/+93
| | |
* | | Add git_tag_foreachMichael Schubert2012-10-091-0/+15
| |/ |/|
* | Merge pull request #967 from arrbee/diff-submodule-tests-and-fixesVicent Martí2012-10-092-3/+11
|\ \ | | | | | | Diff submodule tests and fixes
| * | Add test for diffs with submodules and bug fixesRussell Belfer2012-10-081-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | The adds a test for the submodule diff capabilities and then fixes a few bugs with how the output is generated. It improves the accuracy of OIDs in the diff delta object and makes the submodule output more closely mirror the OIDs that will be used by core git.
| * | Fix a few diff bugs with directory contentRussell Belfer2012-10-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a few cases where diff should leave directories in the diff list if we want to match core git, such as when the directory contains a .git dir. That feature was lost when I introduced some of the new submodule handling. This restores that and then fixes a couple of related to diff output that are triggered by having diffs with directories in them. Also, this adds a new flag that can be passed to diff if you want diff output to actually include the file content of any untracked files.
* | | branch: introduce git_branch_is_head()nulltoken2012-10-071-0/+11
|/ /
* | Merge pull request #939 from pwkelley/ignorecaseRussell Belfer2012-10-021-0/+1
|\ \ | | | | | | Support for the core.ignorecase flag
| * | Support for core.ignorecasePhilip Kelley2012-09-171-0/+1
| | |
* | | remote: support downloading all tagsCarlos Martín Nieto2012-09-301-1/+2
| | | | | | | | | | | | Also honor remote.$name.tagopt = --tags.
* | | remote: add accessors for the autotag settingCarlos Martín Nieto2012-09-301-0/+17
| | |
* | | fetch: use the include-tag capabilityCarlos Martín Nieto2012-09-301-0/+6
| | | | | | | | | | | | | | | This tells the remote to send us any tags that point to objects that we are downloading.
* | | refspec: add git_refspec__free, remove git_refspec_parseCarlos Martín Nieto2012-09-301-8/+0
| | | | | | | | | | | | | | | | | | | | | The latter shouldn't be exposed and isn't used, git_refspec__parse supersedes it. Fix a leak in the refspec tests while we're at it.
* | | Add const to all shared pointers in diff APIRussell Belfer2012-09-251-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of places where the diff API gives the user access to internal data structures and many of these were being exposed through non-const pointers. This replaces them all with const pointers for any object that the user can access but is still owned internally to the git_diff_list or git_diff_patch objects. This will probably break some bindings... Sorry!
* | | Fix bugs in new diff patch codeRussell Belfer2012-09-251-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes all the bugs in the new diff patch code. The only really interesting one is that when we merge two diffs, we now have to actually exclude diff delta records that are not supposed to be tracked, as opposed to before where they could be included because they would be skipped silently by `git_diff_foreach()`. Other than that, there are just minor errors.
* | | Initial implementation of new diff patch APIRussell Belfer2012-09-251-13/+49
| | | | | | | | | | | | | | | | | | | | | | | | Replacing the `git_iterator` object, this creates a simple API for accessing the "patch" for any file pair in a diff list and then gives indexed access to the hunks in the patch and the lines in the hunk. This is the initial implementation of this revised API - it is still broken, but at least builds cleanly.
* | | New take on iterating over diff contentRussell Belfer2012-09-251-143/+100
| | | | | | | | | | | | | | | Allow diff deltas to be accessed by index and make patch generation explicit with hunk and line access by index as well.
* | | Merge pull request #947 from arrbee/public-error-setVicent Martí2012-09-251-0/+34
|\ \ \ | | | | | | | | Make giterr_set_str() and giterr_set_oom() public APIs
| * | | Make giterr_set_str publicRussell Belfer2012-09-211-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There has been discussion for a while about making some set of the `giterr_set` type functions part of the public API for code that is implementing new backends to libgit2. This makes the `giterr_set_str()` and `giterr_set_oom()` functions public.
* | | | refs: introduce git_reference_is_valid_name()nulltoken2012-09-251-1/+12
| | | |
* | | | refs: make git_reference_normalize_name() accept refspec patternnulltoken2012-09-251-2/+0
| |_|/ |/| |
* | | Make clear that git_odb_hashfile does not use filtersSven Strickroth2012-09-221-2/+4
|/ / | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | checkout: add notification callback for skipped filesnulltoken2012-09-211-0/+15
| |
* | checkout: Mimic git_diff_options storage of pathsnulltoken2012-09-171-1/+1
| |
* | repository: introduce git_repository_set_head()nulltoken2012-09-171-0/+22
| |
* | repository: introduce git_repository_set_head_detached()nulltoken2012-09-171-0/+20
| |
View Lorry Controller Status