summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Modified test for revwalk_hidecbAnurag Gupta2014-03-241-2/+2
| | |
| * | Correcting format of comments in header fileAnurag Gupta2014-03-241-13/+13
| | |
| * | Undoing local change done for building on x64Anurag Gupta2014-03-242-2/+1
| | |
| * | Conforming to libgit2 coding style.Anurag Gupta2014-03-244-8/+5
| | |
| * | Remove unused push_cb_dataAnurag Gupta2014-03-241-5/+0
| | |
| * | Unit Tests for hide_cb in revwalkAnurag Gupta2014-03-242-2/+201
| | |
| * | Callback to hide commits in revision walker.Anurag Gupta2014-03-243-0/+56
| | |
* | | Merge pull request #2201 from ethomson/gitbuf_test_fixRussell Belfer2014-03-241-1/+1
|\ \ \ | | | | | | | | env test needs to deref git_buf's ptr
| * | | env test needs to deref git_buf's ptrEdward Thomson2014-03-241-1/+1
|/ / /
* | | Merge pull request #2183 from ethomson/merge_refactorVicent Marti2014-03-2429-999/+1092
|\ \ \ | |/ / |/| | Refactor the `git_merge` API
| * | UNBORN implies FAST_FORWARDEdward Thomson2014-03-203-4/+5
| | |
| * | Introduce GIT_MERGE_ANALYSIS_UNBORNEdward Thomson2014-03-203-14/+52
| | |
| * | git_merge_status -> git_merge_analysisEdward Thomson2014-03-203-37/+41
| | |
| * | Remove `git_merge_result` as it's now unnecessaryEdward Thomson2014-03-2011-239/+39
| | |
| * | Update git_merge_tree_opts to git_merge_optionsEdward Thomson2014-03-2017-75/+75
| | |
| * | Change signature of `git_merge` to take merge and checkout optsEdward Thomson2014-03-2011-116/+75
| | |
| * | Remove fastforward / uptodate from `git_merge`Edward Thomson2014-03-204-189/+73
| | |
| * | Add `git_merge_status` to provide info about an upcoming mergeEdward Thomson2014-03-205-157/+204
| | |
| * | Introduce git_merge_file for consumersEdward Thomson2014-03-2013-280/+640
| | |
* | | Merge pull request #2200 from libgit2/cmn/opts-bufVicent Marti2014-03-243-16/+25
|\ \ \ | | | | | | | | settings: use git_buf for returning strings
| * | | opts: bits are not bytesCarlos Martín Nieto2014-03-241-1/+1
| | | | | | | | | | | | | | | | | | | | The default cache size is 256 megabytes, not megabits as claimed in the docs.
| * | | settings: use git_buf for returning stringsCarlos Martín Nieto2014-03-243-15/+24
|/ / / | | | | | | | | | | | | This survived the last round of culling, as the signature is only in the comments.
* | | Merge pull request #2197 from linquize/assert-wrongVicent Marti2014-03-211-1/+1
|\ \ \ | | | | | | | | Fix wrong assertion
| * | | Fix wrong assertionLinquize2014-03-211-1/+1
|/ / / | | | | | | | | | Fixes issue #2196
* | | Merge pull request #2195 from libgit2/cmn/revwalk-no-hideVicent Marti2014-03-203-5/+22
|\ \ \ | | | | | | | | revwalk: don't try to find merge bases when there can be none
| * | | revwalk: don't try to find merge bases when there can be noneCarlos Martín Nieto2014-03-203-5/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a way to speed up the cases where we need to hide some commits, we find out what the merge bases are so we know to stop marking commits as uninteresting and avoid walking down a potentially very large amount of commits which we will never see. There are however two oversights in current code. The merge-base finding algorithm fails to recognize that if it is only given one commit, there can be no merge base. It instead walks down the whole ancestor chain needlessly. Make it return an empty list immediately in this situation. The revwalk does not know whether the user has asked to hide any commits at all. In situation where the user pushes multiple commits but doesn't hide any, the above fix wouldn't do the trick. Keep track of whether the user wants to hide any commits and only run the merge-base finding algorithm when it's needed.
* | | Merge pull request #2194 from libgit2/cmn/reflog-bareVicent Marti2014-03-202-13/+104
|\ \ \ | |/ / |/| | reflog: follow core.logallrefupdates
| * | reflog: remove some dead codeCarlos Martín Nieto2014-03-201-3/+0
| | |
| * | reflog: follow core.logallrefupdatesCarlos Martín Nieto2014-03-202-10/+104
|/ / | | | | | | | | On bare by default, or when core.logallrefupdates is false, we must not write the reflog.
* | Merge pull request #2193 from libgit2/cmn/reflog-HEADVicent Marti2014-03-193-37/+297
|\ \ | | | | | | Reflog all the way
| * | reflog: handle symref chainsCarlos Martín Nieto2014-03-192-3/+84
| | | | | | | | | | | | | | | Given HEAD -> master -> foo, when updating foo's reflog we should also update HEAD's, as it's considered the current branch.
| * | reflog: handle the birth of a branchCarlos Martín Nieto2014-03-192-18/+72
| | | | | | | | | | | | | | | | | | The reflog append function was overzealous in its checking. When passed an old and new ids, it should not do any checking, but just serialize the data to a reflog entry.
| * | reflog: simplify the append logicCarlos Martín Nieto2014-03-191-22/+7
| | | | | | | | | | | | Remove some duplicated logic.
| * | refdb: don't update when there's no needCarlos Martín Nieto2014-03-193-0/+68
| | | | | | | | | | | | | | | If the caller wants to update a ref to point to the same target as it currently has, we should return early and avoid writing to the reflog.
| * | reflog: more comprehensive HEAD testsCarlos Martín Nieto2014-03-182-4/+76
|/ / | | | | | | | | | | | | | | | | The existing ones lack checking zeroed ids when switching back from an unborn branch as well as what happens when detaching. The reflog appending function mistakenly wrote zeros when dealing with a detached HEAD. This explicitly checks for those situations and fixes them.
* | 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()
View Lorry Controller Status