summaryrefslogtreecommitdiff
path: root/tests
Commit message (Expand)AuthorAgeFilesLines
* remote: test insteadOf for anonymous remotesPatrick Steinhardt2015-05-311-0/+12
* remote: apply insteadOf configuration.Patrick Steinhardt2015-05-312-0/+72
* Merge pull request #3157 from mgorny/ssh_memory_authCarlos Martín Nieto2015-05-291-0/+68
|\
| * test: Add a test for in-memory SSH private key cred_cbMichał Górny2015-05-271-0/+68
* | Rename GIT_EMERGECONFLICT to GIT_ECONFLICTEdward Thomson2015-05-292-12/+12
* | Merge pull request #3139 from ethomson/diff_conflictsCarlos Martín Nieto2015-05-2817-80/+374
|\ \
| * | git_index_add_all: test that conflicts are handledEdward Thomson2015-05-281-49/+104
| * | Introduce cl_git_sandbox_init_new()Edward Thomson2015-05-282-0/+9
| * | introduce `git_index_entry_is_conflict`Edward Thomson2015-05-283-4/+4
| * | conflict tests: use GIT_IDXENTRY_STAGE_SETEdward Thomson2015-05-287-26/+26
| * | diff conflicts: don't include incorrect IDEdward Thomson2015-05-281-0/+46
| * | diff conflicts: test index to workdir w/ conflictsEdward Thomson2015-05-281-0/+45
| * | diff conflicts: add tests for tree to indexEdward Thomson2015-05-283-2/+78
| * | diff/status: introduce conflictsEdward Thomson2015-05-281-2/+2
| * | index: validate mode of new conflictsEdward Thomson2015-05-282-1/+14
| * | conflicts: when adding conflicts, remove stagedEdward Thomson2015-05-282-1/+51
* | | Merge pull request #3149 from libgit2/cmn/upstream-matching-pushEdward Thomson2015-05-282-0/+42
|\ \ \
| * | | branch: error out if we cannot find the remotecmn/upstream-matching-pushCarlos Martín Nieto2015-05-221-0/+32
| * | | refspec: make sure matching refspecs have src, dst and input stringsCarlos Martín Nieto2015-05-221-0/+10
| | |/ | |/|
* | | Merge pull request #3127 from libgit2/cmn/remote-fixupsCarlos Martín Nieto2015-05-283-26/+21
|\ \ \ | |_|/ |/| |
| * | remote: validate refspecs before adding to configCarlos Martín Nieto2015-05-281-0/+2
| * | remote: remove fetch parameter from create_anonymousCarlos Martín Nieto2015-05-282-16/+6
| * | clone: don't rely on auto-saving for single-branchCarlos Martín Nieto2015-05-171-10/+13
* | | Fix ident replacement to match Git behaviorColomban Wendling2015-05-264-15/+15
| |/ |/|
* | Merge pull request #3146 from ethomson/add_untracked_filesCarlos Martín Nieto2015-05-211-0/+23
|\ \
| * | index_add_all: include untracked files in new subdirsEdward Thomson2015-05-201-0/+23
* | | ignore: clear the error when matching a pattern negationcmn/ignored-ignoreCarlos Martín Nieto2015-05-201-0/+12
|/ /
* | Merge pull request #3109 from libgit2/cmn/index-use-diffEdward Thomson2015-05-191-0/+13
|\ \ | |/ |/|
| * index: include TYPECHANGE in the diffCarlos Martín Nieto2015-05-141-0/+13
* | push: add tests for the push negotiation callbackCarlos Martín Nieto2015-05-141-0/+114
|/
* Merge pull request #3119 from ethomson/ignoreCarlos Martín Nieto2015-05-131-1/+62
|\
| * attr tests: make explicit our dir/file match testsEdward Thomson2015-05-131-12/+24
| * attr test: test a file beneath ignored folderEdward Thomson2015-05-121-1/+1
| * attr: test that a file is not ignored for a folderEdward Thomson2015-05-121-0/+17
| * attr: regression tests for ignore matchingEdward Thomson2015-05-121-0/+32
* | Merge pull request #3103 from libgit2/cmn/local-push-messageEdward Thomson2015-05-131-2/+2
|\ \
| * | tests: don't push to our resourcescmn/local-push-messageCarlos Martín Nieto2015-05-131-2/+2
* | | Fix a few leaksCarlos Martín Nieto2015-05-132-0/+3
* | | Merge pull request #3115 from libgit2/cmn/clone-submoduleEdward Thomson2015-05-131-0/+55
|\ \ \ | |/ / |/| |
| * | submodule: add test initialising and cloning a repocmn/clone-submoduleCarlos Martín Nieto2015-05-121-0/+55
| |/
* | remote: remove git_remote_save()Carlos Martín Nieto2015-05-131-12/+0
* | remote: remove live changing of refspecsCarlos Martín Nieto2015-05-136-84/+25
* | remote: move the tagopt setting to the fetch optionsCarlos Martín Nieto2015-05-134-24/+20
* | remote: move the update_fetchhead setting to the optionsCarlos Martín Nieto2015-05-132-4/+4
* | remote: move the transport ctor to the callbacksCarlos Martín Nieto2015-05-134-12/+12
* | remote: remove url and pushurl from the save logicCarlos Martín Nieto2015-05-133-12/+20
* | Remove the callbacks struct from the remoteCarlos Martín Nieto2015-05-1313-204/+140
|/
* stash_apply: provide progress callbacksEdward Thomson2015-05-111-0/+45
* stash_apply: provide its own options structureEdward Thomson2015-05-112-17/+43
* stash: test checkout notify callbacksEdward Thomson2015-05-111-0/+52