summaryrefslogtreecommitdiff
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
* | | Merge pull request #2598 from libgit2/cmn/stacked-ignoreEdward Thomson2014-11-061-0/+32
|\ \ \ | | | | | | | | ignore: don't leak rules into higher directores
| * | | ignore: add failing test for a file mentioning the parentCarlos Martín Nieto2014-11-061-0/+32
| |/ / | | | | | | | | | | | | When we mention "src" in src/.gitignore, we wrongly consider src/ itself to be ignored.
* | | Merge pull request #2682 from libgit2/cmn/fetch-tags-refspecEdward Thomson2014-11-061-0/+27
|\ \ \ | |/ / |/| | remote: check for the validity of the refspec when updating FETCH_HEAD
| * | remote: add a failing test for checking the current branch's upstreamCarlos Martín Nieto2014-11-021-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we update FETCH_HEAD we check whether the remote is the current branch's upstream remote. The code does not check whether the current refspec is relevant for this reference but always tries to perform the reverse transformation, which causes it to error out if the refspec doesn't match the reference. Thanks to Pierre-Olivier Latour for the reproduction recipe.
* | | Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-051-0/+32
|\ \ \ | | | | | | | | ignore: consider files with a CR in their names
| * | | ignore: consider files with a CR in their namescmn/ignore-file-trailing-crCarlos Martín Nieto2014-11-051-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We currently consider CR to start the end of the line, but that means that we miss cases with CR CR LF which can be used with git to match files whose names have CR at the end of their names. The fix from the patch comes from Russell's comment in the issue. This fixes #2536.
* | | | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-031-0/+9
| | | |
* | | | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-031-0/+16
|\ \ \ \ | |/ / / |/| | | Make config reading continue after hitting a missing include file.
| * | | Clean up issues include.path issues found during code review.John Fultz2014-11-021-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Error-handling is cleaned up to only let a file-not-found error through, not other sorts of errors. And when a file-not-found error happens, we clean up the error. * Test now checks that file-not-found introduces no error. And other minor cleanups.
| * | | Make config reading continue after hitting a missing include file.John Fultz2014-11-011-0/+15
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example, if you have [include] path = foo and foo didn't exist, git_config_open_ondisk() would just give up on the rest of the file. Now it ignores the unresolved include without error and continues reading the rest of the file.
* | | remote: fix tagopt testCarlos Martín Nieto2014-11-021-7/+7
|/ / | | | | | | | | | | | | | | | | | | | | An anonymous remote wouldn't create remote-tracking branches, so testing we don't create them for TAGS_ALL is nonsensical. Furthermore, the name of the supposed remote-tracking branch was also not one which would have been created had it had a name. Give the remote a name and test that we only create the tags when we pass TAGS_ALL and that we do create the remote-branch branch when given TAGS_AUTO.
* | revert tests: always use core.autocrlf=false in testsEdward Thomson2014-10-2713-12/+8
| |
* | s/git_merge_head/git_annotated_commitEdward Thomson2014-10-2611-383/+386
| | | | | | | | | | Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
* | rebase: clean up some warnings and memory leaksEdward Thomson2014-10-261-0/+1
| |
* | git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+108
| |
* | rebase: preload all operationsEdward Thomson2014-10-261-12/+12
| |
* | rebase: init/open a git_rebase objectEdward Thomson2014-10-263-50/+88
| |
* | git_rebase_next: provide info about the operationEdward Thomson2014-10-261-17/+34
| |
* | git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-1/+93
| |
* | git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-261-1/+9
| |
* | Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-0/+57
| |