summaryrefslogtreecommitdiff
path: root/tests-clar/merge
Commit message (Collapse)AuthorAgeFilesLines
* Fix warning in tests-clar/merge/workdir/trivial.cLinquize2013-11-111-1/+1
|
* Plug git_merge() related leaksnulltoken2013-11-051-0/+2
|
* merge branch into current, updating workdirEdward Thomson2013-11-057-2/+1252
|
* Initial iconv hookup for precomposed unicodeRussell Belfer2013-10-031-1/+1
| | | | | | | | | | | | | | | | | | | | This hooks up git_path_direach and git_path_dirload so that they will take a flag indicating if directory entry names should be tested and converted from decomposed unicode to precomposed form. This code will only come into play on the Apple platform and even then, only when certain types of filesystems are used. This involved adding a flag to these functions which involved changing a lot of places in the code. This was an opportunity to do a bit of code cleanup here and there, for example, getting rid of the git_futils_cleanupdir_r function in favor of a simple flag to git_futils_rmdir_r to not remove the top level entry. That ended up adding depth tracking during rmdir_r which led to a safety check for infinite directory recursion. Yay. This hasn't actually been tested on the Mac filesystems where the issue occurs. I still need to get test environment for that.
* Fix compilation warningsnulltoken2013-06-291-1/+1
|
* Reorganize diff and add basic diff driverRussell Belfer2013-06-101-1/+1
| | | | | | | | | | | | | | | | | | 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.
* merge setupEdward Thomson2013-05-171-15/+841
|
* Fix trailing whitespacesnulltoken2013-05-156-151/+149
|
* Fix win32 type warningsRussell Belfer2013-05-071-1/+1
|
* bracesEdward Thomson2013-05-021-180/+180
|
* puns are not funny; type punning especially soEdward Thomson2013-05-022-8/+5
|
* merge: Warning noiseVicent Marti2013-05-012-14/+3
|
* move NAME and REUC extensions to sys/Edward Thomson2013-04-302-0/+2
|
* renames!Edward Thomson2013-04-303-1/+614
|
* merge!Edward Thomson2013-04-307-10/+1248
|
* clar: fix merge/setup.cclar2Vicent Marti2013-01-041-21/+1
|
* MERGE_HEAD contents iteratorEdward Thomson2013-01-041-0/+159