summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* odb: hardcode the empty blob and treecmn/empty-objectsCarlos Martín Nieto2014-11-081-1/+23
| | | | | | | | | | | | | | | | | | | | | 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.
* iterator: submodules are determined by an index or treecmn/submodule-and-dirCarlos Martín Nieto2014-11-077-9/+94
| | | | | | | | | | | | 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.
* checkout_index: Remove stage 0 when checking out conflictsEdward Thomson2014-11-061-3/+17
|
* checkout_index: remove conflicts when checking out new filesEdward Thomson2014-11-061-48/+137
|
* Merge pull request #2598 from libgit2/cmn/stacked-ignoreEdward Thomson2014-11-062-0/+28
|\ | | | | 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.
* | Merge pull request #2676 from libgit2/cmn/threadingEdward Thomson2014-11-061-18/+24
|\ \ | | | | | | Threading and crypto libraries
| * | ssl: separate locking init from general initCarlos Martín Nieto2014-11-011-18/+23
| | | | | | | | | | | | | | | 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-061-0/+1
|\ \ \ | |_|/ |/| | 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.
* | Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-crEdward Thomson2014-11-051-1/+10
|\ \ | | | | | | 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-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | |
* | | Merge pull request #2679 from jfultz/missing-includeEdward Thomson2014-11-031-6/+12
|\ \ \ | | | | | | | | Make config reading continue after hitting a missing include file.
| * | | 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.
View Lorry Controller Status