summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* remote: use configured push refspecs if none are givencmn/remote-pushCarlos Martín Nieto2014-11-093-8/+53
| | | | | 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-093-1/+90
| | | | | | | | | 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 #2673 from swisspol/2672Edward Thomson2014-11-084-19/+25
|\ | | | | Fixed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0+
| * Changed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0Pierre-Olivier Latour2014-11-094-19/+25
|/
* Merge pull request #2698 from libgit2/cmn/fetchhead-refactorEdward Thomson2014-11-085-25/+90
|\ | | | | Refactor fetchhead
| * remote: refactor the reference-update decisioncmn/fetchhead-refactorCarlos Martín Nieto2014-11-081-26/+36
| | | | | | | | This is an ugly chunk of code, so let's put it into its own function.
| * remote: don't check for upstream on an anonymous remoteCarlos Martín Nieto2014-11-082-0/+11
| | | | | | | | | | | | | | | | 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.
| * remote: use git_branch_upstream_remote()Carlos Martín Nieto2014-11-081-7/+8
| | | | | | | | | | This reduces the clutter somewhat and lets us see what we're asking about the reference.
| * branch: add getter for the upstream remote nameCarlos Martín Nieto2014-11-083-0/+43
| | | | | | | | This gets the value from branch.<foo>.remote.
* | Merge pull request #2695 from libgit2/cmn/remote-lookupEdward Thomson2014-11-0819-42/+45
|\ \ | | | | | | remote: rename _load() to _lookup()
| * | remote: rename _load() to _lookup()cmn/remote-lookupCarlos Martín Nieto2014-11-0819-42/+45
| |/ | | | | | | This brings it in line with the rest of the lookup functions.
* | Merge pull request #2696 from libgit2/cmn/empty-objectsEdward Thomson2014-11-082-1/+62
|\ \ | | | | | | odb: hardcode the empty blob and tree
| * | odb: hardcode the empty blob and treecmn/empty-objectsCarlos Martín Nieto2014-11-082-1/+62
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | Merge pull request #2694 from Therzok/statusFileEdward Thomson2014-11-084-5/+8
|\ \ | |/ |/| git_status_file now takes an exact path.
| * git_status_file now takes an exact pathUngureanu Marius2014-11-074-5/+8
|/ | | | | | 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.
* Merge pull request #2691 from libgit2/cmn/submodule-and-dirEdward Thomson2014-11-0712-31/+167
|\ | | | | submodules: stale module entries
| * iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-0711-31/+119
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* Merge pull request #2692 from ethomson/bug2515Carlos Martín Nieto2014-11-073-64/+280
|\ | | | | checkout_index: handle other stages
| * checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-062-13/+56
| |
| * checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-062-51/+224
|/
* Merge pull request #2598 from libgit2/cmn/stacked-ignoreEdward Thomson2014-11-063-0/+60
|\ | | | | ignore: don't leak rules into higher directores
| * ignore: don't leak rules into higher directoriescmn/stacked-ignoreCarlos Martín Nieto2014-11-062-0/+28
| | | | | | | | | | | | | | | | | | | | A rule "src" in src/.gitignore must only match subdirectories of src/. The current code does not include this context in the match rule and would thus consider this rule to match the top-level src/ directory instead of the intended src/src/. Keep track fo the context in which the rule was defined so we can perform a prefix match.
| * 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 #2676 from libgit2/cmn/threadingEdward Thomson2014-11-064-18/+124
|\ \ | | | | | | Threading and crypto libraries
| * | docs: explicitly document the threading caveatscmn/threadingCarlos Martín Nieto2014-11-012-0/+84
| | | | | | | | | | | | | | | | | | Talk about sharing objects and error messages; but the most important part is about what to do with the cryptographic libraries, which sadly have to become to responsibility of the application.
| * | ssl: separate locking init from general initCarlos Martín Nieto2014-11-012-18/+39
| | | | | | | | | | | | | | | Extract the lock-setting functions into their own, as we cannot assume that it's ok for us to set this unconditionally.
| * | ssl: clear the OpenSSL locking functionCarlos Martín Nieto2014-11-011-0/+1
| | | | | | | | | | | | | | | We're freeing the memory which holds the locks so we must make sure that the locking function doesn't try to use it.
* | | Merge pull request #2682 from libgit2/cmn/fetch-tags-refspecEdward Thomson2014-11-062-0/+28
|\ \ \ | |_|/ |/| | remote: check for the validity of the refspec when updating FETCH_HEAD
| * | remote: check the relevance of the refspec when updating FETCH_HEADcmn/fetch-tags-refspecCarlos Martín Nieto2014-11-031-0/+1
| | | | | | | | | | | | | | | | | | Before trying to rtransform using the given refspec to figure out what the name of the upstream branch is on the remote, we must make sure that the target of the refspec applies to the current branch's upstream.
| * | 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-052-1/+42
|\ \ \ | | | | | | | | 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-052-1/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #2686 from ethomson/rename_notfoundCarlos Martín Nieto2014-11-032-1/+10
|\ \ \ \ | | | | | | | | | | Propogate GIT_ENOTFOUND from git_remote_rename
| * | | | git_remote_rename: propogate GIT_ENOTFOUNDEdward Thomson2014-11-032-1/+10
|/ / / /
* | | | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-032-6/+28
|\ \ \ \ | | | | | | | | | | Make config reading continue after hitting a missing include file.
| * | | | Clean up issues include.path issues found during code review.John Fultz2014-11-022-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-012-7/+21
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #2661 from swisspol/2656Edward Thomson2014-11-033-3/+8
|\ \ \ \ | |_|/ / |/| | | Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
| * | | Changed context_lines and interhunk_lines to uint32_t to match struct ↵Pierre-Olivier Latour2014-10-273-3/+8
| | | | | | | | | | | | | | | | s_xdemitconf
* | | | Merge pull request #2683 from libgit2/cmn/remote-unifyEdward Thomson2014-11-031-21/+2
|\ \ \ \ | | | | | | | | | | remote: unify the creation code
| * | | | remote: unify the creation codecmn/remote-unifyCarlos Martín Nieto2014-11-021-21/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The create function with default refspec is the same as the one with a custom refspec, but it has the default refspec, so we can create the one on top of the other.
* | | | | Merge pull request #2680 from libgit2/cmn/invalid-cert-returnEdward Thomson2014-11-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | netops: return GIT_ECERTIFICATE when it fails the basic tests
| * | | | | netops: return GIT_ECERTIFICATE when it fails the basic testscmn/invalid-cert-returnCarlos Martín Nieto2014-11-021-1/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we first ask OpenSSL to verify the certfiicate itself (rather than the HTTPS specifics), we should also return GIT_ECERTIFICATE. Otherwise, the caller would consider this as a failed operation rather than a failed validation and not call the user's own validation.
* | | | | Merge pull request #2685 from libgit2/cmn/mmap-readableEdward Thomson2014-11-031-4/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix segmentation fault observed on OpenBSD/sparc64
| * | | | | Fix segmentation fault observed on OpenBSD/sparc64cmn/mmap-readableStefan Sperling2014-11-031-4/+2
| | |/ / / | |/| | | | | | | | | | | | | | | | | | A non-readable mapping of a file causes an access violation in the pack tests. Always use PROT_READ to work around this.
* | | | | Merge pull request #2684 from jacquesg/openssl-windowsEdward Thomson2014-11-031-7/+8
|\ \ \ \ \ | |/ / / / |/| | | | Make the Visual Studio compiler happy
| * | | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ / / /
* | | | 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.