summaryrefslogtreecommitdiff
path: root/include/git2
Commit message (Collapse)AuthorAgeFilesLines
...
* | repository: introduce git_repository_detach_head()nulltoken2012-09-171-0/+19
| |
* | repository: fix documentation typonulltoken2012-09-171-1/+1
| |
* | checkout: drop git_checkout_reference()nulltoken2012-09-171-16/+0
| |
* | checkout: segregate checkout strategiesnulltoken2012-09-171-4/+7
| |
* | reset: add support for GIT_RESET_HARD modenulltoken2012-09-172-0/+4
| |
* | checkout: introduce git_checkout_index()nulltoken2012-09-171-0/+14
| |
* | checkout: introduce git_checkout_tree()nulltoken2012-09-171-2/+27
|/
* Merge pull request #927 from arrbee/hashfile-with-filtersVicent Martí2012-09-131-0/+24
|\ | | | | Add git_repository_hashfile to hash with filters
| * Add tests and improve param checksRussell Belfer2012-09-111-2/+1
| | | | | | | | | | | | | | | | Fixed some minor `git_repository_hashfile` issues: - Fixed incorrect doc (saying that repo could be NULL) - Added checking of object type value to acceptable ones - Added more tests for various parameter permutations
| * Add git_repository_hashfile to hash with filtersRussell Belfer2012-09-111-0/+25
| | | | | | | | | | | | | | | | The existing `git_odb_hashfile` does not apply text filtering rules because it doesn't have a repository context to evaluate the correct rules to apply. This adds a new hashfile function that will apply repository-specific filters (based on config, attributes, and filename) before calculating the hash.
* | Merge pull request #920 from scunz/mergebase_constVicent Martí2012-09-111-1/+1
|\ \ | |/ |/| git_mergebase: Constness-Fix for consistency
| * git_mergebase: Constness-Fix for consistencySascha Cunz2012-09-091-1/+1
| |
* | Merge branch 'diff-crlf-filters' into developmentVicent Marti2012-09-111-31/+53
|\ \
| * | Fix diff binary file detectionRussell Belfer2012-09-111-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the process of adding tests for the max file size threshold (which treats files over a certain size as binary) there seem to be a number of problems in the new code with detecting binaries. This should fix those up, as well as add a test for the file size threshold stuff. Also, this un-deprecates `GIT_DIFF_LINE_ADD_EOFNL`, since I finally found a legitimate situation where it would be returned.
| * | Move diff max_size to public APIRussell Belfer2012-09-101-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a max_size value in the public `git_diff_options` structure so that the user can automatically flag blobs over a certain size as binary regardless of other properties. Also, and perhaps more importantly, this moves binary detection to be as early as possible in the diff traversal inner loop and makes sure that we stop loading objects as soon as we decide that they are binary.
| * | Replace git_diff_iterator_num_files with progressRussell Belfer2012-09-101-17/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `git_diff_iterator_num_files` API was problematic, since we don't actually know the exact number of files to be iterated over until we load those files into memory. This replaces it with a new `git_diff_iterator_progress` API that goes from 0 to 1, and moves and renamed the old API for the internal places that can tolerate a max value instead of an exact value.
| * | Better header commentsRussell Belfer2012-09-061-24/+34
| | |
* | | Merge pull request #906 from nulltoken/topic/git_reference_peelRussell Belfer2012-09-103-10/+33
|\ \ \ | |_|/ |/| | git reference peel
| * | checkout: fix documentation code alignmentnulltoken2012-09-061-10/+12
| | |
| * | errors: introduce GIT_EBAREREPOnulltoken2012-09-061-0/+1
| | |
| * | refs: introduce git_reference_peel()nulltoken2012-09-061-0/+20
| |/ | | | | | | Fix #530
* | Add missing accessor for fetchRecurseSubmodulesRussell Belfer2012-09-071-0/+29
|/ | | | | | When `git_submodule` became an opaque structure, I forgot to add accessor functions for the fetchRecurseSubmodules config setting. This fixes that.
* Merge pull request #900 from pwkelley/developmentVicent Martí2012-09-061-0/+6
|\ | | | | Expose a malloc function to 3rd party ODB backends
| * Expose a malloc function to 3rd party ODB backendsPhilip Kelley2012-08-271-0/+6
| |
* | diff: Cleanup documentation and printf compatVicent Marti2012-09-061-1/+12
| |
* | Fix comments and a minor bugRussell Belfer2012-09-051-34/+100
| | | | | | | | | | This adds better header comments and also fixes a bug in one of simple APIs that tells the number of lines in the current hunk.
* | Diff iteratorsRussell Belfer2012-09-053-3/+62
| | | | | | | | | | | | | | | | | | | | | | This refactors the diff output code so that an iterator object can be used to traverse and generate the diffs, instead of just the `foreach()` style with callbacks. The code has been rearranged so that the two styles can still share most functions. This also replaces `GIT_REVWALKOVER` with `GIT_ITEROVER` and uses that as a common error code for marking the end of iteration when using a iterator style of object.
* | Merge pull request #856 from libgit2/utf8-winVicent Martí2012-09-041-59/+0
|\ \ | | | | | | Windows: Perform UTF-8 path conversion on the Stack
| * | windows: Keep UTF-8 on the stack yoVicent Marti2012-08-281-59/+0
| | |
* | | branch: Add missing includeVicent Marti2012-09-041-0/+1
|/ /
* | Merge branch 'branch-delete-ref' into developmentVicent Marti2012-08-272-13/+15
|\ \ | | | | | | | | | | | | Conflicts: include/git2/refs.h
| * | branch: Change `git_branch_delete` to take a refbranch-delete-refVicent Marti2012-08-262-13/+13
| |/
* | Merge pull request #904 from arrbee/better-object-peelVicent Martí2012-08-272-5/+8
|\ \ | | | | | | Make git_object_peel a bit smarter
| * | Make git_object_peel a bit smarterRussell Belfer2012-08-272-5/+8
| |/ | | | | | | | | | | | | | | | | | | | | This expands the types of peeling that `git_object_peel` knows how to do to include TAG -> BLOB peeling, and makes the errors slightly more consistent depending on the situation. It also adds a new special behavior where peeling to ANY will peel until the object type changes (e.g. chases TAGs to a non-TAG). Using this expanded peeling, this replaces peeling code that was embedded in `git_tag_peel` and `git_reset`.
* | Merge pull request #897 from nulltoken/topic/git_reference_check_formatVicent Martí2012-08-271-0/+48
|\ \ | |/ |/| refs: expose git_reference_normalize_name()
| * refs: expose git_reference_normalize_name()nulltoken2012-08-271-0/+48
| |
* | indexer: kill git_indexer_stats.data_receivedCarlos Martín Nieto2012-08-261-1/+0
| | | | | | | | | | | | | | It's not really needed with the current code as we have EOS and the sideband's flush to tell us we're done. Keep the distinction between processed and received objects.
* | Merge pull request #895 from carlosmn/sidebandVicent Martí2012-08-242-1/+3
|\ \ | | | | | | Add sideband support
| * | network: add sideband supportCarlos Martín Nieto2012-08-241-1/+1
| | | | | | | | | | | | | | | This lets us notify the user of what the remote end is doing while we wait for it to start sending us the packfile.
| * | indexer: recognize and mark when all of the packfile has been downloadedCarlos Martín Nieto2012-08-241-0/+2
| |/ | | | | | | | | We can't always rely on the network telling us when the download is finished. Recognize it from the indexer itself.
* | Working implementation of git_submodule_statusRussell Belfer2012-08-243-91/+103
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a big redesign of the git_submodule_status API and the implementation of the redesigned API. It also fixes a number of bugs that I found in other parts of the submodule API while writing the tests for the status part. This also fixes a couple of bugs in the iterators that had not been noticed before - one with iterating when there is a gitlink (i.e. separate-work-dir) and one where I was treating anything even vaguely submodule-like as a submodule, more aggressively than core git does.
* | Major submodule rewriteRussell Belfer2012-08-242-45/+421
|/ | | | | This replaces the old submodule API with a new extended API that supports most of the things that can be done with `git submodule`.
* Fix warnings and merge issues on Win64Russell Belfer2012-08-231-0/+5
|
* Some cleanup suggested during reviewRussell Belfer2012-08-221-13/+2
| | | | | | | | | | This cleans up a number of items suggested during code review with @vmg, including: * renaming "outside repo" config API to `git_config_open_default` * killing the `git_config_open_global` API * removing the `git_` prefix from the static functions in fileops * removing some unnecessary functionality from the "cp" command
* Add template dir and set gid to repo initRussell Belfer2012-08-222-17/+42
| | | | | | | | | | | | | | | | | This extends git_repository_init_ext further with support for initializing the repository from an external template directory and with support for the "create shared" type flags that make a set GID repository directory. This also adds tests for much of the new functionality to the existing `repo/init.c` test suite. Also, this adds a bunch of new utility functions including a very general purpose `git_futils_mkdir` (with the ability to make paths and to chmod the paths post-creation) and a file tree copying function `git_futils_cp_r`. Also, this includes some new path functions that were useful to keep the code simple.
* Add git_repository_init_ext for power inittersRussell Belfer2012-08-221-4/+131
| | | | | | | The extended version of repository init adds support for many of the things that you can do with `git init` and sets up structures that will make it easier to extend further in the future.
* Merge pull request #891 from arrbee/internal-ignore-apiVicent Martí2012-08-221-0/+74
|\ | | | | API for managing in-memory ignore rules
| * Wrap up ignore API and add testsRussell Belfer2012-08-221-0/+74
| | | | | | | | This fills out the ignore API and adds tests.
* | tree entry: rename git_tree_entry_attributes() into git_tree_entry_filemode()nulltoken2012-08-211-2/+2
| |
* | filemode: deploy enum usagenulltoken2012-08-211-2/+2
| |
View Lorry Controller Status