• Show log

    Commit

  • Hash : 8b0ddd5d
    Author : Edward Thomson
    Date : 2015-01-17T23:28:53

    merge: lock the index at the start of the merge
    
    Always lock the index when we begin the merge, before we write
    any of the metdata files.  This prevents a race where another
    client may run a commit after we have written the MERGE_HEAD but
    before we have updated the index, which will produce a merge
    commit that is treesame to one parent.  The merge will finish and
    update the index and the resultant commit would not be a merge at
    all.
    

  • README.md

  • Writing Clar tests for libgit2

    For information on the Clar testing framework and a detailed introduction please visit:

    https://github.com/vmg/clar

    • Write your modules and tests. Use good, meaningful names.

    • Make sure you actually build the tests by setting:

        cmake -DBUILD_CLAR=ON build/
    • Test:

        ./build/libgit2_clar
    • Make sure everything is fine.

    • Send your pull request. That’s it.