summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* remote: remove git_push from the public APIcmn/hide-pushCarlos Martín Nieto2014-12-303-54/+39
| | | | | Instead we provide git_remote_upload() and git_remote_update_tips() in order to have a parallel API for fetching and pushing.
* push: fold unpack_ok() into finish()Carlos Martín Nieto2014-12-101-4/+0
| | | | | The push cannot be successful if we sent a bad packfile. We should return an error in that case instead of storing it elsewhere.
* core::link test: clean up junction point nameEdward Thomson2014-12-091-7/+50
|
* win32: remember to free wide env name/valueEdward Thomson2014-12-091-1/+3
|
* Merge pull request #2750 from linquize/generate.pyEdward Thomson2014-12-081-5/+5
|\ | | | | Update clar to e3985dd
| * Update clar to e3985ddLinquize2014-12-071-5/+5
| |
* | Fix broken merge tests due to autocrlf was not falseLinquize2014-12-072-0/+20
| |
* | Fix broken test suite on WindowsLinquize2014-12-071-3/+2
|/
* Merge pull request #2746 from libgit2/cmn/neg-ignore-dirEdward Thomson2014-12-061-5/+14
|\ | | | | Fix negative ignores withing ignored dirs
| * ignore: adjust test for negating inside a dirCarlos Martín Nieto2014-12-051-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Given top !top/foo in an ignore file, we should not unignore top/foo. This is an implementation detail of the git code leaking, but that's the behaviour we should show. A negation rule can only negate an exact rule it has seen before.
* | Merge pull request #2730 from libgit2/cmn/local-pushEdward Thomson2014-12-051-0/+34
|\ \ | | | | | | Adjust the local transport for the common refspec parser
| * | remote: add test for pushing and deleting with the local transportCarlos Martín Nieto2014-11-231-0/+34
| | |
* | | notes: move the notes name argumentCarlos Martín Nieto2014-12-064-11/+11
| |/ |/| | | | | | | Make it consistent between git_note_create() and git_note_remote() by putting it after the repository.
* | Merge pull request #2744 from epmatsw/spellingnulltoken2014-12-051-1/+1
|\ \ | | | | | | Spelling fixes
| * | Spelling fixesWill Stamper2014-12-041-1/+1
| | |
* | | init: return the number of initializationsEdward Thomson2014-12-041-0/+14
|/ /
* | fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat()Jeff Hostetler2014-11-261-1/+1
| |
* | Merge pull request #2718 from libgit2/cmn/peeling-errorsEdward Thomson2014-11-233-17/+30
|\ \ | |/ |/| peel: reject bad queries with EPEEL
| * peel: reject bad queries with EINVALIDSPECcmn/peeling-errorsCarlos Martín Nieto2014-11-223-17/+30
| | | | | | | | | | | | | | | | | | | | There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.
* | Plug leaksCarlos Martín Nieto2014-11-234-6/+8
| | | | | | | | Valgrind is now clean except for libssl and libgcrypt.
* | buffer: Do not `put` anything if len is 0Vicent Marti2014-11-211-3/+2
| |
* | odb: `git_odb_object` contents are never NULLvmg/emptyVicent Marti2014-11-211-0/+18
| | | | | | | | | | | | | | This is a contract that we made in the library and that we need to uphold. The contents of a blob can never be NULL because several parts of the library (including the filter and attributes code) expect `git_blob_rawcontent` to always return a valid pointer.
* | fetch: clear the connection data on closecmn/fetch-twiceCarlos Martín Nieto2014-11-191-0/+11
|/ | | | | | | | | | | When we fetch twice with the same remote object, we did not properly clear the connection flags, so we would leak state from the last connection. This can cause the second fetch with the same remote object to fail if using a HTTP URL where the server redirects to HTTPS, as the second fetch would see `use_ssl` set and think the initial connection wanted to downgrade the connection.
* Merge pull request #2654 from linquize/missing-objEdward Thomson2014-11-188-3/+5
|\ | | | | Fix missing object in tests/resources/crlf by changing the tail commit
| * Fix missing object in tests/resources/crlf by changing the tail commitLinquize2014-10-268-3/+5
| |
* | Merge pull request #2608 from libgit2/cmn/remote-pushEdward Thomson2014-11-183-59/+114
|\ \ | | | | | | Provide a convenience function `git_remote_push()`
| * | remote: use configured push refspecs if none are givencmn/remote-pushCarlos Martín Nieto2014-11-091-4/+38
| | | | | | | | | | | | | | | If the user does not pass any refspecs to push, try to use those configured via the configuration or via add_push().
| * | push: move main test function to git_remote_push()Carlos Martín Nieto2014-11-093-59/+80
| | | | | | | | | | | | | | | | | | | | | We have the step-by-step method in the initialization function as we want to remove references based on the list of references which are already there, and we can use the convenience function for testing the main push.
| * | remote: introduce git_remote_push()Carlos Martín Nieto2014-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This function, similar in style to git_remote_fetch(), performs all the steps required for a push, with a similar interface. The remote callbacks struct has learnt about the push callbacks, letting us set the callbacks a single time instead of setting some in the remote and some in the push operation.
* | | Merge pull request #2671 from swisspol/remote_create_fixEdward Thomson2014-11-171-0/+35
|\ \ \ | | | | | | | | Fixed active_refspecs field not initialized on new git_remote objects
| * | | Fixed active_refspecs field not initialized on new git_remote objectsPierre-Olivier Latour2014-11-171-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new remote, contrary to loading one from disk, active_refspecs was not populated. This means that if using the new remote to push, git_push_update_tips() will be a no-op since it checks the refspecs passed during the push against the base ones i.e. active_refspecs. And therefore the local refs won't be created or updated after the push operation.
* | | | Merge pull request #2693 from libgit2/cmn/push-refspec-refactorEdward Thomson2014-11-172-13/+10
|\ \ \ \ | | | | | | | | | | push: use the common refspec parser
| * | | | push: use the common refspec parsercmn/push-refspec-refactorCarlos Martín Nieto2014-11-092-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is one well-known and well-tested parser which we should use, instead of implementing parsing a second time. The common parser is also augmented to copy the LHS into the RHS if the latter is empty. The expressions test had to change a bit, as we now catch a bad RHS of a refspec locally.
* | | | | Merge pull request #2699 from swisspol/fix_warningsEdward Thomson2014-11-171-1/+0
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed a couple Clang warnings
| * | | | Fixed a couple Clang warningsPierre-Olivier Latour2014-11-101-1/+0
| | |/ / | |/| |
* | | | branch: consider an empty upstream remote config as not foundCarlos Martín Nieto2014-11-171-0/+16
| | | |
* | | | Rename git_threads_ to git_libgit2_Carlos Martín Nieto2014-11-082-4/+4
|/ / / | | | | | | | | | | | | | | | This describes their purpose better, as we now initialize ssl and some other global stuff in there. Calling the init function is not something which has been optional for a while now.
* | | Changed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0Pierre-Olivier Latour2014-11-091-1/+1
| | |
* | | Merge pull request #2698 from libgit2/cmn/fetchhead-refactorEdward Thomson2014-11-082-0/+19
|\ \ \ | | | | | | | | Refactor fetchhead
| * | | remote: don't check for upstream on an anonymous remoteCarlos Martín Nieto2014-11-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the remote is anonymous, then we cannot check for any configuration, as there is no name. Check for this before we try to use the name, which may be a NULL pointer. This fixes #2697.
| * | | branch: add getter for the upstream remote nameCarlos Martín Nieto2014-11-081-0/+9
| | | | | | | | | | | | | | | | This gets the value from branch.<foo>.remote.
* | | | Merge pull request #2695 from libgit2/cmn/remote-lookupEdward Thomson2014-11-0812-30/+30
|\ \ \ \ | | | | | | | | | | remote: rename _load() to _lookup()
| * | | | remote: rename _load() to _lookup()cmn/remote-lookupCarlos Martín Nieto2014-11-0812-30/+30
| |/ / / | | | | | | | | | | | | This brings it in line with the rest of the lookup functions.
* | | | Merge pull request #2696 from libgit2/cmn/empty-objectsEdward Thomson2014-11-081-0/+39
|\ \ \ \ | | | | | | | | | | odb: hardcode the empty blob and tree
| * | | | odb: hardcode the empty blob and treecmn/empty-objectsCarlos Martín Nieto2014-11-081-0/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git hardocodes these as objects which exist regardless of whether they are in the odb and uses them in the shell interface as a way of expressing the lack of a blob or tree for one side of e.g. a diff. In the library we use each language's natural way of declaring a lack of value which makes a workaround like this unnecessary. Since git uses it, it does however mean each shell application would need to perform this check themselves. This makes it common work across a range of applications and an issue with compatibility with git, which fits right into what the library aims to provide. Thus we introduce the hard-coded empty blob and tree in the odb frontend. These hard-coded objects are checked for before going to the backends, but after the cache check, which means the second time they're used, they will be treated as normal cached objects instead of creating new ones.
* | | | git_status_file now takes an exact pathUngureanu Marius2014-11-071-3/+1
|/ / / | | | | | | | | | | | | | | | This function has one output but can match multiple files, which can be unexpected for the user, which would usually path the exact path of the file he wants the status of.
* | | iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-074-22/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot know from looking at .gitmodules whether a directory is a submodule or not. We need the index or tree we are comparing against to tell us. Otherwise we have to assume the entry in .gitmodules is stale or otherwise invalid. Thus we pass the index of the repository into the workdir iterator, even if we do not want to compare against it. This follows what git does, which even for `git diff <tree>`, it will consider staged submodules as such.
* | | submodules: add failing test for stale module entriesCarlos Martín Nieto2014-11-071-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | We consider an entry in .gitmodules to mean that we have a submodule at a particular path, even if HEAD^{tree} and the index do not contain any reference to it. We should ignore that submodule entry and simply consider that path to be a regular directory.
* | | checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-061-10/+39
| | |
* | | checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-061-3/+87
| | |
View Lorry Controller Status