src/merge.c


Log

Author Commit Date CI Message
Russell Belfer 114f5a6c 2013-06-10T10:10:39 Reorganize diff and add basic diff driver 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.
Russell Belfer cee695ae 2013-05-31T12:18:43 Make iterators use GIT_ITEROVER & smart advance 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.
Edward Thomson 9c06b250 2013-05-16T13:04:37 merge setup
nulltoken 1fed6b07 2013-05-13T21:57:37 Fix trailing whitespaces
Vicent Martí 03c28d92 2013-05-06T06:45:53 Merge pull request #1526 from arrbee/cleanup-error-return-without-msg Make sure error messages are set for most error returns
Edward Thomson 4e7c1560 2013-05-02T14:58:40 puns are not funny; type punning especially so
Russell Belfer de19c4a9 2013-05-01T14:00:20 Set error when no merge base is found
Vicent Marti e1807113 2013-05-01T15:31:23 merge: Warning noise
Edward Thomson 75d1c8c6 2013-04-30T17:33:11 move NAME and REUC extensions to sys/
Edward Thomson 0462fba5 2013-04-30T14:56:41 renames!
Edward Thomson bec65a5e 2013-04-01T22:16:21 merge!
Edward Thomson 359fc2d2 2013-01-08T17:07:25 update copyrights
Edward Thomson c31ae146 2013-01-06T18:38:29 merge cleanup should actually cleanup and the test should actually test
Edward Thomson 5a62d659 2013-01-03T12:44:09 MERGE_HEAD contents iterator
Edward Thomson 35560d6d 2013-01-03T15:53:50 expose merge metadata cleanup
Edward Thomson 42e50b5e 2013-01-03T12:44:09 MERGE_HEAD contents iterator
Edward Thomson ad2bc32f 2013-01-03T15:53:50 expose merge metadata cleanup
Russell Belfer d5e44d84 2012-11-29T17:02:27 Fix function name and add real error check `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.
Scott J. Goldman 0984c876 2012-11-28T18:27:43 Rename git_count_ahead_behind -> git_graph_ahead_behind 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 *`.
Scott J. Goldman c6d03c95 2012-11-28T18:07:08 fix coding style: while( -> while (
Scott J. Goldman bff53e54 2012-11-27T16:36:50 Add initial implementation of ahead-behind count
Ben Straub 4ff192d3 2012-11-26T19:47:47 Move merge functions to merge.c In so doing, promote commit_list to git_commit_list, with its own internal API header.
Edward Thomson 632d8b23 2012-10-23T15:42:09 reset changes for merge