Hash :
78859c63
Author :
Date :
2015-11-20T17:33:49
merge: handle conflicts in recursive base building When building a recursive merge base, allow conflicts to occur. Use the file (with conflict markers) as the common ancestor. The user has already seen and dealt with this conflict by virtue of having a criss-cross merge. If they resolved this conflict identically in both branches, then there will be no conflict in the result. This is the best case scenario. If they did not resolve the conflict identically in the two branches, then we will generate a new conflict. If the user is simply using standard conflict output then the results will be fairly sensible. But if the user is using a mergetool or using diff3 output, then the common ancestor will be a conflict file (itself with diff3 output, haha!). This is quite terrible, but it matches git's behavior.
Git HTTP | https://git.kmx.io/thodg/libgit2.git |
---|---|
Git SSH | git@git.kmx.io:thodg/libgit2.git |
Public access ? | public |
Description | |
Users |
![]() |
Tags |
|
libgit2
is a portable, pure C implementation of the Git core methods
provided as a re-entrant linkable library with a solid API, allowing you to
write native speed custom Git applications in any language with bindings.
libgit2
is licensed under a very permissive license (GPLv2 with a special
Linking Exception). This basically means that you can link it (unmodified)
with any kind of software without having to release its source code.
Additionally, the example code has been released to the public domain (see the
separate license for more information).
libgit2
is already very usable and is being used in production for many
applications including the GitHub.com site, in Plastic SCM and also powering
Microsoft’s Visual Studio tools for Git. The library provides:
While the library provides git functionality without the need for dependencies, it can make use of a few libraries to add to it:
The library needs to keep track of some global state. Call
git_libgit2_init();
before calling any other libgit2 functions. You can call this function many times. A matching number of calls to
git_libgit2_shutdown();
will free the resources. Note that if you have worker threads, you should
call git_libgit2_shutdown
after those threads have exited. If you
require assistance coordinating this, simply have the worker threads call
git_libgit2_init
at startup and git_libgit2_shutdown
at shutdown.
See THREADING for information
libgit2
builds cleanly on most platforms without any external dependencies.
Under Unix-like systems, like Linux, *BSD and Mac OS X, libgit2 expects pthreads
to be available;
they should be installed by default on all systems. Under Windows, libgit2 uses the native Windows API
for threading.
The libgit2
library is built using CMake (version 2.8 or newer) on all platforms.
On most systems you can build the library using the following commands
$ mkdir build && cd build
$ cmake ..
$ cmake --build .
Alternatively you can point the CMake GUI tool to the CMakeLists.txt file and generate platform specific build project or IDE workspace.
To install the library you can specify the install prefix by setting:
$ cmake .. -DCMAKE_INSTALL_PREFIX=/install/prefix
$ cmake --build . --target install
For more advanced use or questions about CMake please read http://www.cmake.org/Wiki/CMake_FAQ.
The following CMake variables are declared:
BIN_INSTALL_DIR
: Where to install binaries to. LIB_INSTALL_DIR
: Where to install libraries to. INCLUDE_INSTALL_DIR
: Where to install headers to. BUILD_SHARED_LIBS
: Build libgit2 as a Shared Library (defaults to ON) BUILD_CLAR
: Build Clar-based test suite (defaults to ON) THREADSAFE
: Build libgit2 with threading support (defaults to ON) STDCALL
: Build libgit2 as stdcall
. Turn off for cdecl
(Windows; defaults to ON) CMake lets you specify a few variables to control the behavior of the compiler and linker. These flags are rarely used but can be useful for 64-bit to 32-bit cross-compilation.
CMAKE_C_FLAGS
: Set your own compiler flags CMAKE_FIND_ROOT_PATH
: Override the search path for libraries ZLIB_LIBRARY
, OPENSSL_SSL_LIBRARY
AND OPENSSL_CRYPTO_LIBRARY
:
Tell CMake where to find those specific libraries
If you want to build a universal binary for Mac OS X, CMake sets it
all up for you if you use -DCMAKE_OSX_ARCHITECTURES="i386;x86_64"
when configuring.
You need to run the CMake commands from the Visual Studio command
prompt, not the regular or Windows SDK one. Select the right generator
for your version with the -G "Visual Studio X" option. See [the website](https://libgit2.github.com/docs/guides/build-and-link) for more detailed instructions. Android ------- Extract toolchain from NDK using,
make-standalone-toolchain.shscript. Optionally, crosscompile and install OpenSSL inside of it. Then create CMake toolchain file that configures paths to your crosscompiler (substitute
{PATH}with full path to the toolchain): SET(CMAKE_SYSTEM_NAME Linux) SET(CMAKE_SYSTEM_VERSION Android) SET(CMAKE_C_COMPILER {PATH}/bin/arm-linux-androideabi-gcc) SET(CMAKE_CXX_COMPILER {PATH}/bin/arm-linux-androideabi-g++) SET(CMAKE_FIND_ROOT_PATH {PATH}/sysroot/) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) Add
-DCMAKE_TOOLCHAIN_FILE={pathToToolchainFile}to cmake command when configuring. Language Bindings ================================== Here are the bindings to libgit2 that are currently available: * C++ * libqgit2, Qt bindings <https://projects.kde.org/projects/playground/libs/libqgit2/> * Chicken Scheme * chicken-git <https://wiki.call-cc.org/egg/git> * D * dlibgit <https://github.com/s-ludwig/dlibgit> * Delphi * GitForDelphi <https://github.com/libgit2/GitForDelphi> * Erlang * Geef <https://github.com/carlosmn/geef> * Go * git2go <https://github.com/libgit2/git2go> * GObject * libgit2-glib <https://live.gnome.org/Libgit2-glib> * Haskell * hgit2 <https://github.com/fpco/gitlib> * Java * Jagged <https://github.com/ethomson/jagged> * Julia * LibGit2.jl <https://github.com/jakebolewski/LibGit2.jl> * Lua * luagit2 <https://github.com/libgit2/luagit2> * .NET * libgit2sharp <https://github.com/libgit2/libgit2sharp> * Node.js * node-gitteh <https://github.com/libgit2/node-gitteh> * nodegit <https://github.com/tbranyen/nodegit> * Objective-C * objective-git <https://github.com/libgit2/objective-git> * OCaml * ocaml-libgit2 <https://github.com/fxfactorial/ocaml-libgit2> * Parrot Virtual Machine * parrot-libgit2 <https://github.com/letolabs/parrot-libgit2> * Perl * Git-Raw <https://github.com/jacquesg/p5-Git-Raw> * PHP * php-git <https://github.com/libgit2/php-git> * PowerShell * GitPowerShell <https://github.com/ethomson/gitpowershell> * Python * pygit2 <https://github.com/libgit2/pygit2> * R * git2r <https://github.com/ropensci/git2r> * Ruby * Rugged <https://github.com/libgit2/rugged> * Rust * git2-rs <https://github.com/alexcrichton/git2-rs> * Swift * Gift <https://github.com/modocache/Gift> * Vala * libgit2.vapi <https://github.com/apmasell/vapis/blob/master/libgit2.vapi> If you start another language binding to libgit2, please let us know so we can add it to the list. How Can I Contribute? ================================== Check the [contribution guidelines](CONTRIBUTING.md) to understand our workflow, the libgit2 [coding conventions](CONVENTIONS.md), and out list of [good starting projects](PROJECTS.md). License ==================================
libgit2` is under GPL2 with linking exception. This means you can link to
and use the library from any program, proprietary or open source; paid or
gratis. However, you cannot modify libgit2 and distribute it without
supplying the source.
See the COPYING file for the full license text.