summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge pull request #2189 from Aimeast/octopusVicent Marti2014-03-183-2/+105
| |\ \ \ \ | | | | | | | | | | | | Implement git_merge_base_octopus
| | * | | | Implement git_merge_base_octopusAimeast2014-03-183-2/+105
| | | | | |
| * | | | | Merge pull request #2192 from phkelley/developmentVicent Marti2014-03-182-20/+104
| |\ \ \ \ \ | | |/ / / / | |/| | | | Seamless support for NTLM/Kerberos auth on Windows
| | * | | | Seamless support for NTLM/Kerberos auth on WindowsPhilip Kelley2014-03-182-20/+104
| | | | | |
| * | | | | Merge pull request #2190 from libgit2/cmn/current-branch-reflogVicent Marti2014-03-189-56/+124
| |\ \ \ \ \ | | |/ / / / | |/| | | | refs: append to the HEAD reflog when updating the current branch
| | * | | | refs: append to the HEAD reflog when updating the current branchCarlos Martín Nieto2014-03-175-31/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we update the current branch, we must also append to HEAD's reflog to keep them in sync. This is a bit of a hack, but as git.git says, it covers 100% of default cases.
| | * | | | repo: remove test which deletes HEADCarlos Martín Nieto2014-03-171-21/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is not something anybody would ever do; removing HEAD makes the .git/ directory no longer be a repository, so we wouldn't be expected to handle such a situation.
| | * | | | branch: constness fixesCarlos Martín Nieto2014-03-174-4/+4
| | | | | |
| * | | | | Merge pull request #2191 from libgit2/cmn/projectsRussell Belfer2014-03-171-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| | | | Add a few projects to the list
| | * | | | Add a few projects to the listCarlos Martín Nieto2014-03-171-0/+9
| |/ / / /
| * | | | refs: fix copy-paste doc errorCarlos Martín Nieto2014-03-131-1/+1
| | | | |
| * | | | Merge pull request #2184 from libgit2/rb/fix-revwalk-order-regressionEdward Thomson2014-03-123-1/+91
| |\ \ \ \ | | |/ / / | |/| | | Fix pqueue sort boundary condition bug
| | * | | Fix pqueue sort boundary condition bugRussell Belfer2014-03-123-1/+91
| |/ / / | | | | | | | | | | | | | | | | | | | | If the pqueue comparison fn returned just 0 or 1 (think "a<b") then the sort order of returned items could be wrong because there was a "< 0" that really needed to be "<= 0". Yikes!!!
| * | | MSVC is sillyCarlos Martín Nieto2014-03-101-2/+2
| | | |
| * | | Merge pull request #2175 from Yogu/submodule-resolve-urlVicent Marti2014-03-102-10/+30
| |\ \ \ | | | | | | | | | | Add git_submodule_resolve_url()
| | * | | Add git_submodule_resolve_url()Jan Melcher2014-03-102-10/+30
| | | | |
| * | | | Merge pull request #2177 from shiftkey/typo-fixPaul Betts2014-03-091-1/+1
| |\ \ \ \ | | |/ / / | |/| | | corrected typo in error message
| | * | | corrected typo in error messageBrendan Forster2014-03-101-1/+1
| |/ / /
| * | | Merge pull request #2170 from ethomson/clarVicent Marti2014-03-072-4/+4
| |\ \ \ | | | | | | | | | | Update clar to e1990d6
| | * | | Update clar to e1990d6Edward Thomson2014-03-072-4/+4
| |/ / /
| * | | Merge pull request #2028 from libgit2/options-namesVicent Marti2014-03-0727-159/+184
| |\ \ \ | | | | | | | | | | Rename options structures
| | * | | git_revert_opts -> git_revert_optionsoptions-namesBen Straub2014-03-064-29/+29
| | | | |
| | * | | git_checkout_opts -> git_checkout_optionsBen Straub2014-03-0625-131/+156
| | | | |
| * | | | Merge pull request #2153 from mekishizufu/tag_exampleRussell Belfer2014-03-074-2/+320
| |\ \ \ \ | | | | | | | | | | | | Add a tag example
| | * | | | Move all variable declarations to the top of the blockJiri Pospisil2014-03-051-4/+7
| | | | | |
| | * | | | Add tag exampleJiri Pospisil2014-03-053-1/+316
| | | | | |
| | * | | | Fix typoJiri Pospisil2014-03-051-1/+1
| | | | | |
| * | | | | Merge pull request #2167 from mekishizufu/memory_access_fixesVicent Marti2014-03-072-21/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | Fun with memory access
| | * | | | | blame: Fix compare function's data typesJiri Pospisil2014-03-071-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the hunk_byfinalline_search_cmp function was called with different data types (size_t and uint32_t) for the key argument but expected only the former resulting in an invalid memory access when passed the latter on a 64 bit machine. The following patch makes sure that the function is called and works with the same type (size_t).
| | * | | | | git_oid_fromstrn: Simplify the implementation and fix memory access issuesJiri Pospisil2014-03-071-15/+9
| | | | | | |
| * | | | | | Merge pull request #2169 from libgit2/valgrindVicent Marti2014-03-079-15/+44
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Plug leaks
| | * | | | | Plug a few leaks in the testsCarlos Martín Nieto2014-03-076-1/+22
| | | | | | |
| | * | | | | branch: fix leak when checking against HEADCarlos Martín Nieto2014-03-071-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We look up a reference in order to figure out if it's the current branch, which we need to free once we're done with the check. As a bonus, only perform the check when we're passed the force flag, as it's a useless check otherwise.
| | * | | | | commit: simplify and correct refcounting in nth_gen_ancestorCarlos Martín Nieto2014-03-071-9/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can make use of git_object_dup to use refcounting instead of pointer comparison to make sure we don't free the caller's object. This also lets us simplify the case for '~0' which is now just an assignment instead of looking up the object we have at hand.
| | * | | | | local transport: catch double-opensCarlos Martín Nieto2014-03-071-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Combinations of connect + fetch can call local_open multiple times. Detect this and skip the initialization stage.
| * | | | | Merge pull request #2168 from ethomson/clarVicent Marti2014-03-072-0/+26
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Update clar to a0b00f0
| | * | | | Update clar to a0b00f0Edward Thomson2014-03-072-0/+26
| |/ / / /
| * | | | tests: MSVC compatCarlos Martín Nieto2014-03-061-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | MSVC doesn't like declaring variables in the middle of a block, so make sure we only declare variables at the beginning of a block.
| * | | | Merge pull request #2165 from libgit2/revert-1997Vicent Marti2014-03-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | Revert pull request #1997
| | * | | | Revert pull request #1997revert-1997Vicent Marti2014-03-061-1/+1
| |/ / / /
| * | | | Merge pull request #1997 from mgbowen/merge-options-init-fixVicent Marti2014-03-061-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix GIT_MERGE_OPTS_INIT on MSVC.
| | * | | | Fix GIT_MERGE_OPTS_INIT on MSVC.Matthew Bowen2013-12-091-1/+1
| | | | | |
| * | | | | Merge pull request #2014 from mgbowen/cpp-options-initVicent Marti2014-03-0629-0/+516
| |\ \ \ \ \ | | | | | | | | | | | | | | Function-based options initializers
| | * | | | | Added function-based initializers for every options struct.Matthew Bowen2014-03-0529-0/+516
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The basic structure of each function is courtesy of arrbee.
| * | | | | | Merge pull request #2162 from sunheehnus/devBen Straub2014-03-052-3/+51
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | examples/diff:Add the shortstat flag to examples/diff.c
| | * | | | | Merge completed: resolve the conflict with the upstreamSun He2014-03-0616-30/+309
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #2159 from libgit2/rb/odb-exists-prefixVicent Marti2014-03-0610-16/+234
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add ODB API to check for existence by prefix and object id shortener
| | * | | | | | Check short OID len in odb, not in backendsRussell Belfer2014-03-052-10/+3
| | | | | | | |
| | * | | | | | Add git_object_short_id API to get short id stringRussell Belfer2014-03-043-0/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finds a short id string that will unambiguously select the given object, starting with the core.abbrev length (usually 7) and growing until it is no longer ambiguous.
| | * | | | | | Add exists_prefix to ODB backend and ODB APIRussell Belfer2014-03-047-10/+138
| | | | | | | |
View Lorry Controller Status