summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Clean up issues include.path issues found during code review.John Fultz2014-11-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-7/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-031-1/+1
|\ \ \ | |_|/ |/| | 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-271-1/+1
| | | | | | | | | | | | 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.
* | | Make the Visual Studio compiler happyJacques Germishuys2014-11-031-7/+8
|/ /
* | Fixed potential crash with uninitialized variablesPierre-Olivier Latour2014-10-272-2/+2
| |
* | Removed some useless variable assignmentsPierre-Olivier Latour2014-10-274-6/+1
|/
* Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2Carlos Martín Nieto2014-10-278-24/+29
|\
| * Fix compiler warning (git_off_t cast to size_t).Albert Meltzer2014-05-198-24/+29
| | | | | | | | | | | | Use size_t for page size, instead of long. Check result of sysconf. Use size_t for page offset so no cast to size_t (second arg to p_mmap). Use mod instead div/mult pair, so no cast to size_t is necessary.
* | Minor cleanup: Use defined no_check_cert_flags instead of C&P them againSven Strickroth2014-10-261-8/+6
| | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | rebase: updates based on PR commentsEdward Thomson2014-10-261-17/+31
| |
* | s/git_merge_head/git_annotated_commitEdward Thomson2014-10-265-178/+205
| | | | | | | | | | 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-26/+14
| |
* | rebase: oid member of operation should be constEdward Thomson2014-10-261-2/+2
| |
* | git_rebase: iterators for operationsEdward Thomson2014-10-261-0/+21
| |
* | rebase: preload all operationsEdward Thomson2014-10-261-111/+151
| |
* | rebase: init/open a git_rebase objectEdward Thomson2014-10-261-234/+276
| |
* | git_rebase_next: provide info about the operationEdward Thomson2014-10-261-2/+9
| |
* | git_rebase_finish: rewrite notes when finishing rebaseEdward Thomson2014-10-261-16/+150
| |
* | Introduce `git_note_author`, `git_note_committer`Edward Thomson2014-10-262-4/+34
| |
* | git_rebase_commit: write HEAD's reflog appropriatelyEdward Thomson2014-10-264-34/+58
| |
* | Introduce git_rebase_finish to complete a rebaseEdward Thomson2014-10-261-1/+62
| |
* | git_rebase_commit: drop already-picked commitsEdward Thomson2014-10-261-4/+15
| | | | | | | | | | | | Already cherry-picked commits should not be re-included. If all changes included in a commit exist in the upstream, then we should error with GIT_EAPPLIED.
* | Introduce git_rebase_commitEdward Thomson2014-10-263-11/+122
| | | | | | | | Commit the current patch of a rebase process.
* | git_rebase_next: write conflicts nicely during rebaseEdward Thomson2014-10-261-18/+102
| |
* | Introduce git_rebase_nextEdward Thomson2014-10-261-0/+156
| | | | | | | | | | | | `git_rebase_next` will apply the next patch (or cherry-pick) operation, leaving the results checked out in the index / working directory so that consumers can resolve any conflicts, as appropriate.
* | Introduce git_rebase_abortEdward Thomson2014-10-261-0/+128
| | | | | | | | | | Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
* | git_reset: const the git_signature argEdward Thomson2014-10-261-1/+1
| |
* | Introduce git_rebase to set up a rebase sessionEdward Thomson2014-10-264-24/+357
| | | | | | | | | | | | Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
* | Remove unused warning on non-win32Edward Thomson2014-10-261-1/+1
| |
* | iterator: free paths when skipping themEdward Thomson2014-10-261-1/+4
| |
* | mwindow: clean up pack map at shutdownEdward Thomson2014-10-261-0/+2
| |
* | global: clean up openssl_locks on shutdownEdward Thomson2014-10-261-1/+7
| |
* | Cleanup memory leak in ssh transportEdward Thomson2014-10-261-34/+28
| |
* | Clean up some memory leaksEdward Thomson2014-10-261-0/+1
| |
* | Clean up various compiler warningsEdward Thomson2014-10-265-11/+20
| |
* | Merge pull request #2638 from libgit2/cmn/config-refresh-removeEdward Thomson2014-10-243-28/+1
|\ \ | | | | | | config: remove the refresh function and backend field
| * | config: remove the refresh function and backend fieldcmn/config-refresh-removeCarlos Martín Nieto2014-10-233-28/+1
| | | | | | | | | | | | | | | | | | We have been refreshing on read and write for a while now, so git_config_refresh() is at best a no-op, and might just end up wasting cycles.
* | | Merge pull request #2646 from libgit2/cmn/remote-renameEdward Thomson2014-10-241-25/+21
|\ \ \ | | | | | | | | remote: accept a repo and name for renaming
| * | | remote: accept a repo and name for renamingcmn/remote-renameCarlos Martín Nieto2014-10-241-25/+21
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Remote objects are not meant to be changed from under the user. We did this in rename, but only the name and left the refspecs, such that a save would save the wrong refspecs (and a fetch and anything else would use the wrong refspecs). Instead, let's simply take a name and not change any loaded remote from under the user.
* | | Merge pull request #2649 from swisspol/2630Edward Thomson2014-10-241-2/+3
|\ \ \ | | | | | | | | Fixed memory leak in git_tag_delete()
| * | | Fixed memory leak in git_tag_delete()Pierre-Olivier Latour2014-10-241-2/+3
| | | |
* | | | Merge pull request #2645 from libgit2/cmn/common-cryptoEdward Thomson2014-10-242-1/+47
|\ \ \ \ | |/ / / |/| | | [RFC] Use CommonCrypto for hashing
| * | | hash: use CommonCrypto on OSX for SHA-1cmn/common-cryptoCarlos Martín Nieto2014-10-242-1/+47
| | | | | | | | | | | | | | | | | | | | OSX has its own cryptographic library, let's make use of it instead of calling out to OpenSSL.
View Lorry Controller Status