summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #2817 from PeterDaveHello/patch-1nulltoken2015-01-131-1/+1
|\ \ \ \ | | | | | | | | | | Use svg instead of png to get better image quality
| * | | | Use svg instead of png to get better image qualityPeter Dave Hello2015-01-141-1/+1
| | | | |
* | | | | Pre-fill the changelog with the subheadingsCarlos Martín Nieto2015-01-131-0/+8
|/ / / /
* | | | Merge pull request #2815 from ethomson/examplev0.22.0Carlos Martín Nieto2015-01-121-3/+9
|\ \ \ \ | | | | | | | | | | clone example: don't divide by zero
| * | | | clone example: don't divide by zeroEdward Thomson2015-01-101-3/+9
|/ / / / | | | | | | | | | | | | | | | | Local transports don't have data about the size, avoid dividing by zero in the callback.
* | | | Reformat the changelogv0.22.0-rc2Carlos Martín Nieto2015-01-101-146/+158
| |_|/ |/| | | | | | | | | | | This should provide a easier way to see what kinds of changes we have, and a single place to look at the breaking changes.
* | | Merge commit '4b1018d24f980273528743c27c47ceb96cb720bd'Carlos Martín Nieto2015-01-092-1/+33
|\ \ \ | | | | | | | | | | | | Fix crash in free() when git_buf_grow() fails.
| * | | Fix crash in free() when git_buf_grow() fails.Jeff Hostetler2015-01-092-1/+33
| | | |
* | | | Fix warningCarlos Martín Nieto2015-01-091-1/+1
| | | |
* | | | Merge pull request #2810 from ethomson/remove_symlinksCarlos Martín Nieto2015-01-092-10/+40
|\ \ \ \ | | | | | | | | | | Remove symlinks from the repository
| * | | | repo::init test: create hook symlinkEdward Thomson2015-01-082-10/+40
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Remove the hook symlink from the test resources, so that we can have a source tree that is easy to zip up and copy around on systems that don't support symlinks. Create it dynamically at test execution instead.
* | | | Merge pull request #2811 from ethomson/remote_leakEdward Thomson2015-01-082-6/+10
|\ \ \ \ | | | | | | | | | | remote: plug leak
| * | | | submodule::init tests: free some leaksEdward Thomson2015-01-081-1/+5
| | | | |
| * | | | remote: plug leakEdward Thomson2015-01-081-5/+5
|/ / / /
* | | | Merge pull request #2802 from calavera/remote_create_prune_configEdward Thomson2015-01-082-13/+77
|\ \ \ \ | |/ / / |/| | | Load prune configuration when a remote is created.
| * | | Fix more indentation.David Calavera2015-01-071-1/+1
| | | |
| * | | Fix intentation.David Calavera2015-01-052-2/+2
| | | |
| * | | Load prune configuration when a remote is created.David Calavera2015-01-052-14/+78
| | | |
* | | | Add extern function to initialize submodule update options.David Calavera2015-01-073-3/+30
| | | |
* | | | Merge pull request #2806 from ethomson/changelogCarlos Martín Nieto2015-01-071-0/+4
|\ \ \ \ | | | | | | | | | | CHANGELOG: we've added git_describe
| * | | | CHANGELOG: we've added git_describeEdward Thomson2015-01-061-0/+4
| | | | |
* | | | | Merge pull request #2805 from ethomson/msvcEdward Thomson2015-01-061-1/+4
|\ \ \ \ \ | | | | | | | | | | | | submodule: declare vars at top of func block
| * | | | | submodule: declare vars at top of func blockEdward Thomson2015-01-061-1/+4
| |/ / / /
* | | | | Merge pull request #2803 from ethomson/appveyorEdward Thomson2015-01-061-0/+19
|\ \ \ \ \ | |/ / / / |/| | | | Add appveyor yaml
| * | | | Add appveyor yamlEdward Thomson2015-01-061-0/+19
|/ / / /
* | | | Merge pull request #2801 from ethomson/changelogv0.22.0-rc1Carlos Martín Nieto2015-01-051-2/+37
|\ \ \ \ | | | | | | | | | | CHANGELOG: add missing 0.22 changes
| * | | | CHANGELOG: add missing 0.22 changesEdward Thomson2015-01-051-2/+37
| | | | |
* | | | | Merge pull request #2799 from ethomson/merge_docCarlos Martín Nieto2015-01-051-0/+8
|\ \ \ \ \ | |/ / / / |/| | | | Better document `git_merge_commits`
| * | | | Better document `git_merge_commits`Edward Thomson2015-01-051-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | `git_merge_commits` (and thus `git_merge`) do not use the same strategy as `git-merge-recursive` wherein they can produce an artificial common ancestor that is the merge of all common ancestors. Document this accordingly.
* | | | Fix the version in CHANGELOG to 0.22Carlos Martín Nieto2015-01-051-1/+4
| | | | | | | | | | | | | | | | | | | | The release after 0.21 is 0.22. Add a new heading for the changes since 0.22.
* | | | Bump version to 0.22Carlos Martín Nieto2015-01-051-3/+3
| | | | | | | | | | | | | | | | Bump the version number to 0.22.0 and the SOVERSION to 22.
* | | | Merge commit 'refs/pull/2632/head' of github.com:libgit2/libgit2Carlos Martín Nieto2015-01-0523-25/+819
|\ \ \ \ | |/ / / |/| | |
| * | | Introduce a convenience function for submodule updatejamill/submodule_updateJameson Miller2014-12-227-17/+692
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces the functionality of submodule update in 'git_submodule_do_update'. The existing 'git_submodule_update' function is renamed to 'git_submodule_update_strategy'. The 'git_submodule_update' function now refers to functionality similar to `git submodule update`, while `git_submodule_update_strategy` is used to get the configured value of submodule.<name>.update.
| * | | submodule init should resolve relative url pathsJameson Miller2014-12-2218-10/+131
| | | | | | | | | | | | | | | | | | | | Submodule init should handle relative paths in .gitmodules files and resolve these urls when updating the git config file.
* | | | Plug a couple of leaksCarlos Martín Nieto2015-01-042-1/+1
| | | |
* | | | Merge pull request #2792 from swisspol/fix_remote_downloadCarlos Martín Nieto2015-01-041-0/+5
|\ \ \ \ | | | | | | | | | | Fixed internal push state not being cleared when calling git_remote_download()
| * | | | Fixed internal push state not being cleared on downloadPierre-Olivier Latour2015-01-011-0/+5
| | |/ / | |/| | | | | | | | | | git_remote_download() must also clear the internal push state resulting from a possible earlier push operation. Otherwise calling git_remote_update_tips() will execute the push version instead of the fetch version and among other things, tags won't be updated.
* | | | Merge pull request #2794 from calavera/include_right_commonCarlos Martín Nieto2015-01-041-1/+1
|\ \ \ \ | |/ / / |/| | | Include git2/common.h in sys/openssl.h.
| * | | Include git2/common.h in sys/openssl.h.David Calavera2015-01-021-1/+1
|/ / /
* | | Merge pull request #2788 from swisspol/fix_docsEdward Thomson2014-12-311-1/+1
|\ \ \ | | | | | | | | Fixed git_revert() documentation
| * | | Fixed git_revert() documentationPierre-Olivier Latour2014-12-301-1/+1
|/ / /
* | | Merge pull request #2761 from libgit2/cmn/fetch-pruneEdward Thomson2014-12-305-0/+474
|\ \ \ | | | | | | | | Remote-tracking branch prunning
| * | | Update CHANGELOG for pruningcmn/fetch-pruneCarlos Martín Nieto2014-12-301-0/+5
| | | |
| * | | fetch: plug leaks in the prune testsCarlos Martín Nieto2014-12-141-18/+34
| | | |
| * | | fetch: remove the prune setterCarlos Martín Nieto2014-12-143-19/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This option does not get persisted to disk, which makes it different from the rest of the setters. Remove it until we go all the way. We still respect the configuration option, and it's still possible to perform a one-time prune by calling the function.
| * | | fetch: add test for the other order of overlapping specsCarlos Martín Nieto2014-12-141-0/+9
| | | |
| * | | fetch: perform prune in separate stepsCarlos Martín Nieto2014-12-141-45/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For each remote-tracking branch we want to remove, we need to consider it against every other refspec in case we have overlapping refspecs, such as with refs/heads/*:refs/remotes/origin/* refs/pull/*/head:refs/remotes/origin/pr/* as we'd otherwise remove too many refspecs. Create a list of condidates, which are the references matching the rhs of any active refspec and then filter that list by removing those entries for which we find a remove reference with any active refspec. Those which are left after this are removed.
| * | | fetch: prune after updating tipsCarlos Martín Nieto2014-12-141-3/+6
| | | | | | | | | | | | | | | | | | | | This makes a fetch+prune more similar to a connect+prune and makes it more likely that we see errors in the decision to prune a reference.
| * | | fetch: assert we don't call update tips when there are no upatesCarlos Martín Nieto2014-12-141-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is hiding a bug in the prune code, whereby we prune references we shouldn't but don't notice it in the code afterwards because update_tips() recreates them. This means that we do perform changes to the references (and get rid of the reflogs) when we shouldn't.
| * | | fetch: do set prune when testingCarlos Martín Nieto2014-12-141-0/+1
| | | | | | | | | | | | | | | | | | | | We load the remote again, so we need to ask the new remote to prune the refs, or we're not exercising the code in our tests.
View Lorry Controller Status