summaryrefslogtreecommitdiff
path: root/src/merge.c
Commit message (Collapse)AuthorAgeFilesLines
* Fix some more memory leaks in error pathRémi Duraffort2013-07-151-1/+3
|
* Reorganize diff and add basic diff driverRussell Belfer2013-06-101-0/+2
| | | | | | | | | | | | | | | | | | This is a significant reorganization of the diff code to break it into a set of more clearly distinct files and to document the new organization. Hopefully this will make the diff code easier to understand and to extend. This adds a new `git_diff_driver` object that looks of diff driver information from the attributes and the config so that things like function content in diff headers can be provided. The full driver spec is not implemented in the commit - this is focused on the reorganization of the code and putting the driver hooks in place. This also removes a few #includes from src/repository.h that were overbroad, but as a result required extra #includes in a variety of places since including src/repository.h no longer results in pulling in the whole world.
* Make iterators use GIT_ITEROVER & smart advanceRussell Belfer2013-05-311-3/+12
| | | | | | | | | | | | | | | 1. internal iterators now return GIT_ITEROVER when you go past the last item in the iteration. 2. git_iterator_advance will "advance" to the first item in the iteration if it is called immediately after creating the iterator, which allows a simpler idiom for basic iteration. 3. if git_iterator_advance encounters an error reading data (e.g. a missing tree or an unreadable file), it returns the error but also attempts to advance past the invalid data to prevent an infinite loop. Updated all tests and internal usage of iterators to account for these new behaviors.
* merge setupEdward Thomson2013-05-171-40/+555
|
* Fix trailing whitespacesnulltoken2013-05-151-164/+163
|
* Merge pull request #1526 from arrbee/cleanup-error-return-without-msgVicent Martí2013-05-061-1/+2
|\ | | | | Make sure error messages are set for most error returns
| * Set error when no merge base is foundRussell Belfer2013-05-011-1/+2
| |
* | puns are not funny; type punning especially soEdward Thomson2013-05-021-6/+16
| |
* | merge: Warning noiseVicent Marti2013-05-011-1/+1
| |
* | move NAME and REUC extensions to sys/Edward Thomson2013-04-301-0/+1
| |
* | renames!Edward Thomson2013-04-301-1/+484
| |
* | merge!Edward Thomson2013-04-301-3/+843
|/
* update copyrightsEdward Thomson2013-01-081-1/+1
|
* merge cleanup should actually cleanup and the test should actually testEdward Thomson2013-01-061-1/+1
|
* MERGE_HEAD contents iteratorEdward Thomson2013-01-031-0/+53
|
* expose merge metadata cleanupEdward Thomson2013-01-031-1/+1
|
* Fix function name and add real error checkRussell Belfer2012-11-291-4/+4
| | | | | | | `revwalk.h:commit_lookup()` -> `git_revwalk__commit_lookup()` and make `git_commit_list_parse()` do real error checking that the item in the list is an actual commit object. Also fixed an apparent typo in a test name.
* Rename git_count_ahead_behind -> git_graph_ahead_behindScott J. Goldman2012-11-281-82/+0
| | | | | | Moved it into graph.{c,h} which i created for the new "graph" functions namespace. Also adjusted the function prototype to use `size_t` and `const git_oid *`.
* fix coding style: while( -> while (Scott J. Goldman2012-11-281-1/+1
|
* Add initial implementation of ahead-behind countScott J. Goldman2012-11-281-0/+81
|
* Move merge functions to merge.cBen Straub2012-11-271-0/+196
| | | | | In so doing, promote commit_list to git_commit_list, with its own internal API header.
* reset changes for mergeEdward Thomson2012-10-241-0/+48