summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Teach `git_patch_from_diff` about parsed diffsethomson/patch_from_diffEdward Thomson2016-08-249-7/+50
| | | | | Ensure that `git_patch_from_diff` can return the patch for parsed diffs, not just generate a patch for a generated diff.
* filesystem_iterator: fixed double free on errorJason Haslam2016-08-221-5/+3
|
* Merge pull request #3837 from novalis/dturner/indexv4Edward Thomson2016-08-174-29/+179
|\ | | | | Support index v4
| * index: support index v4David Turner2016-08-102-29/+120
| | | | | | | | | | | | | | Support reading and writing index v4. Index v4 uses a very simple compression scheme for pathnames, but is otherwise similar to index v3. Signed-off-by: David Turner <dturner@twitter.com>
| * varint: Add varint encoding/decodingDavid Turner2016-08-102-0/+59
| | | | | | | | | | | | | | This code is ported from git.git Signed-off-by: Junio C Hamano <gitster@pobox.com> Signed-off-by: David Turner <dturner@twopensource.com>
* | Merge pull request #3895 from pks-t/pks/negate-basename-in-subdirsEdward Thomson2016-08-171-16/+45
|\ \ | |/ |/| ignore: allow unignoring basenames in subdirectories
| * ignore: allow unignoring basenames in subdirectoriesPatrick Steinhardt2016-08-121-16/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The .gitignore file allows for patterns which unignore previous ignore patterns. When unignoring a previous pattern, there are basically three cases how this is matched when no globbing is used: 1. when a previous file has been ignored, it can be unignored by using its exact name, e.g. foo/bar !foo/bar 2. when a file in a subdirectory has been ignored, it can be unignored by using its basename, e.g. foo/bar !bar 3. when all files with a basename are ignored, a specific file can be unignored again by specifying its path in a subdirectory, e.g. bar !foo/bar The first problem in libgit2 is that we did not correctly treat the second case. While we verified that the negative pattern matches the tail of the positive one, we did not verify if it only matches the basename of the positive pattern. So e.g. we would have also negated a pattern like foo/fruz_bar !bar Furthermore, we did not check for the third case, where a basename is being unignored in a certain subdirectory again. Both issues are fixed with this commit.
* | stransport: do not use `git_stream_free` on uninitialized stransportPatrick Steinhardt2016-08-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | When failing to initialize a new stransport stream, we try to release already allocated memory by calling out to `git_stream_free`, which in turn called out to the stream's `free` function pointer. As we only initialize the function pointer later on, this leads to a `NULL` pointer exception. Furthermore, plug another memory leak when failing to create the SSL context.
* | Merge pull request #3887 from libgit2/ethomson/empty_blobCarlos Martín Nieto2016-08-081-5/+0
|\ \ | | | | | | odb: only provide the empty tree
| * | odb: only provide the empty treeEdward Thomson2016-08-051-5/+0
| | | | | | | | | | | | | | | | | | | | | Only provide the empty tree internally, which matches git's behavior. If we provide the empty blob then any users trying to write it with libgit2 would omit it from actually landing in the odb, which appear to git proper as a broken repository (missing that object).
* | | Merge pull request #3890 from pks-t/pks/stransport-static-linkageEdward Thomson2016-08-081-8/+8
|\ \ \ | |/ / |/| | stransport: make internal functions static
| * | stransport: make internal functions staticPatrick Steinhardt2016-08-081-8/+8
| | |
* | | SecureTransport: handle NULL trust on successcmn/copypeertrust-nullCarlos Martín Nieto2016-08-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `SSLCopyPeerTrust` call can succeed but fail to return a trust object if it can't load the certificate chain and thus cannot check the validity of a certificate. This can lead to us calling `CFRelease` on a `NULL` trust object, causing a crash. Handle this by returning ECERTIFICATE.
* | | apply: fix warning when initializing patch imagesPatrick Steinhardt2016-08-051-1/+1
| | |
* | | pool: provide macro to statically initialize git_poolPatrick Steinhardt2016-08-051-0/+5
| |/ |/|
* | odb: only freshen pack files every 2 secondsethomson/refresh_objectsEdward Thomson2016-08-045-10/+23
| | | | | | | | | | | | Since writing multiple objects may all already exist in a single packfile, avoid freshening that packfile repeatedly in a tight loop. Instead, only freshen pack files every 2 seconds.
* | odb: freshen existing objects when writingEdward Thomson2016-08-045-3/+96
| | | | | | | | | | | | When writing an object, we calculate its OID and see if it exists in the object database. If it does, we need to freshen the file that contains it.
* | Merge pull request #3877 from libgit2/ethomson/paths_initCarlos Martín Nieto2016-08-042-52/+41
|\ \ | | | | | | sysdir: don't assume an empty dir is uninitialized
| * | sysdir: use the standard `init` patternethomson/paths_initEdward Thomson2016-08-042-52/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't try to determine when sysdirs are uninitialized. Instead, simply initialize them all at `git_libgit2_init` time and never try to reinitialize, except when consumers explicitly call `git_sysdir_set`. Looking at the buffer length is especially problematic, since there may no appropriate path for that value. (For example, the Windows-specific programdata directory has no value on non-Windows machines.) Previously we would continually trying to re-lookup these values, which could get racy if two different threads are each calling `git_sysdir_get` and trying to lookup / clear the value simultaneously.
* | | Merge pull request #3869 from richardipsum/fix-outdated-commentEdward Thomson2016-08-041-3/+3
|\ \ \ | | | | | | | | Fix outdated comment
| * | | Make comment conform to style guideRichard Ipsum2016-07-231-1/+2
| | | | | | | | | | | | | | | | Style guide says // style comments should be avoided.
| * | | Fix outdated commentRichard Ipsum2016-07-231-2/+1
| | | | | | | | | | | | | | | | SSH transport seems to be supported now.
* | | | Merge pull request #3850 from wildart/custom-tlsEdward Thomson2016-08-043-6/+1
|\ \ \ \ | | | | | | | | | | Enable https transport for custom TLS streams
| * | | | remove conditions that prevent use of custom TLS streamwildart2016-07-063-6/+1
| | | | |
* | | | | Merge pull request #3879 from libgit2/ethomson/mwindow_initEdward Thomson2016-08-044-26/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | mwindow: init mwindow files in git_libgit2_init
| * | | | mwindow: init mwindow files in git_libgit2_initethomson/mwindow_initEdward Thomson2016-08-044-26/+12
| | |_|/ | |/| |
* | | | git_diff_file: move `id_abbrev`ethomson/diff_fileEdward Thomson2016-08-031-3/+3
|/ / / | | | | | | | | | | | | Move `id_abbrev` to a more reasonable place where it packs more nicely (before anybody starts using it).
* | | Merge pull request #3865 from libgit2/ethomson/leaksEdward Thomson2016-08-028-86/+113
|\ \ \ | | | | | | | | Fix leaks, some warnings and an error
| * | | crlf: set a safe crlf defaultEdward Thomson2016-07-241-0/+1
| | | |
| * | | repository: don't cast to `int` for no reasonEdward Thomson2016-07-241-4/+4
| | | | | | | | | | | | | | | | | | | | And give it a default so that some compilers don't (unnecessarily) complain.
| * | | index: cast to avoid warningEdward Thomson2016-07-241-2/+2
| | | |
| * | | packbuilder: `size_t` all the thingsEdward Thomson2016-07-243-77/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After 1cd65991, we were passing a pointer to an `unsigned long` to a function that now expected a pointer to a `size_t`. These types differ on 64-bit Windows, which means that we trash the stack. Use `size_t`s in the packbuilder to avoid this.
| * | | apply: safety check files that dont end with eolEdward Thomson2016-07-241-1/+4
| | | |
| * | | apply: check allocation properlyEdward Thomson2016-07-241-1/+1
| | | |
| * | | apply: compare preimage to imageEdward Thomson2016-07-241-1/+1
| | |/ | |/| | | | | | | Compare the preimage to the image; don't compare the preimage to itself.
* | | remote: Handle missing config values when deleting a remoteDavid Turner2016-07-151-4/+10
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Somehow I ended up with the following in my ~/.gitconfig: [branch "master"] remote = origin merge = master rebase = true I assume something went crazy while I was running the git.git tests some time ago, and that I never noticed until now. This is not a good configuration, but it shouldn't cause problems. But it does. Specifically, if you have this in your config, and you perform the following set of actions: create a remote fetch from that remote create a branch off of the remote master branch called "master" delete the branch delete the remote The remote delete fails with the message "Could not find key 'branch.master.rebase' to delete". This is because it's iterating over the config entries (including the ones in the global config) and believes that there is a master branch which must therefore have these config keys. https://github.com/libgit2/libgit2/issues/3856
* | Merge pull request #3851 from txdv/get-user-agentEdward Thomson2016-07-051-0/+8
|\ \ | | | | | | Add get user agent functionality.
| * | Add get user agent functionality.Andrius Bentkus2016-07-051-0/+8
| |/
* | Merge pull request #3846 from rkrp/fix_bug_parsing_int64minEdward Thomson2016-07-051-3/+3
|\ \ | |/ |/| Fixed bug while parsing INT64_MIN
| * Fixed bug while parsing INT64_MINKrishna Ram Prakash R2016-06-291-3/+3
| |
* | Merge pull request #3836 from joshtriplett/cleanup-find_repoEdward Thomson2016-07-011-22/+30
|\ \ | | | | | | find_repo: Clean up and simplify logic
| * | find_repo: Clean up and simplify logicJosh Triplett2016-06-241-22/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find_repo had a complex loop and heavily nested conditionals, making it difficult to follow. Simplify this as much as possible: - Separate assignments from conditionals. - Check the complex loop condition in the only place it can change. - Break out of the loop on error, rather than going through the rest of the loop body first. - Handle error cases by immediately breaking, rather than nesting conditionals. - Free repo_link unconditionally on the way out of the function, rather than in multiple places. - Add more comments on the remaining complex steps.
* | | Merge pull request #3711 from joshtriplett/git_repository_discover_defaultEdward Thomson2016-07-011-17/+197
|\ \ \ | |/ / | | | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment vars
| * | Add GIT_REPOSITORY_OPEN_FROM_ENV flag to respect $GIT_* environment varsJosh Triplett2016-06-241-0/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git_repository_open_ext provides parameters for the start path, whether to search across filesystems, and what ceiling directories to stop at. git commands have standard environment variables and defaults for each of those, as well as various other parameters of the repository. To avoid duplicate environment variable handling in users of libgit2, add a GIT_REPOSITORY_OPEN_FROM_ENV flag, which makes git_repository_open_ext automatically handle the appropriate environment variables. Commands that intend to act just like those built into git itself can use this flag to get the expected default behavior. git_repository_open_ext with the GIT_REPOSITORY_OPEN_FROM_ENV flag respects $GIT_DIR, $GIT_DISCOVERY_ACROSS_FILESYSTEM, $GIT_CEILING_DIRECTORIES, $GIT_INDEX_FILE, $GIT_NAMESPACE, $GIT_OBJECT_DIRECTORY, and $GIT_ALTERNATE_OBJECT_DIRECTORIES. In the future, when libgit2 gets worktree support, git_repository_open_env will also respect $GIT_WORK_TREE and $GIT_COMMON_DIR; until then, git_repository_open_ext with this flag will error out if either $GIT_WORK_TREE or $GIT_COMMON_DIR is set.
| * | Add GIT_REPOSITORY_OPEN_NO_DOTGIT flag to avoid appending /.gitJosh Triplett2016-06-241-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GIT_REPOSITORY_OPEN_NO_SEARCH does not search up through parent directories, but still tries the specified path both directly and with /.git appended. GIT_REPOSITORY_OPEN_BARE avoids appending /.git, but opens the repository in bare mode even if it has a working directory. To support the semantics git uses when given $GIT_DIR in the environment, provide a new GIT_REPOSITORY_OPEN_NO_DOTGIT flag to not try appending /.git.
| * | Fix repository discovery with ceiling_dirs at current directoryJosh Triplett2016-06-241-17/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git only checks ceiling directories when its search ascends to a parent directory. A ceiling directory matching the starting directory will not prevent git from finding a repository in the starting directory or a parent directory. libgit2 handled the former case correctly, but differed from git in the latter case: given a ceiling directory matching the starting directory, but no repository at the starting directory, libgit2 would stop the search at that point rather than finding a repository in a parent directory. Test case using git command-line tools: /tmp$ git init x Initialized empty Git repository in /tmp/x/.git/ /tmp$ cd x/ /tmp/x$ mkdir subdir /tmp/x$ cd subdir/ /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x git rev-parse --git-dir fatal: Not a git repository (or any of the parent directories): .git /tmp/x/subdir$ GIT_CEILING_DIRECTORIES=/tmp/x/subdir git rev-parse --git-dir /tmp/x/.git Fix the testsuite to test this case (in one case fixing a test that depended on the current behavior), and then fix find_repo to handle this case correctly. In the process, simplify and document the logic in find_repo(): - Separate the concepts of "currently checking a .git directory" and "number of iterations left before going further counts as a search" into two separate variables, in_dot_git and min_iterations. - Move the logic to handle in_dot_git and append /.git to the top of the loop. - Only search ceiling_dirs and find ceiling_offset after running out of min_iterations; since ceiling_offset only tracks the longest matching ceiling directory, if ceiling_dirs contained both the current directory and a parent directory, this change makes find_repo stop the search at the parent directory.
* | | index: include conflicts in `git_index_read_index`ethomson/read_index_conflictsEdward Thomson2016-06-291-6/+7
| | | | | | | | | | | | | | | | | | Ensure that we include conflicts when calling `git_index_read_index`, which will remove conflicts in the index that do not exist in the new target, and will add conflicts from the new target.
* | | index: refactor common `read_index` functionalityEdward Thomson2016-06-291-13/+36
| | | | | | | | | | | | | | | | | | Most of `git_index_read_index` is common to reading any iterator. Refactor it out in case we want to implement `read_tree` in terms of it in the future.
* | | Merge pull request #3813 from stinb/submodule-update-fetchEdward Thomson2016-06-291-4/+16
|\ \ \ | | | | | | | | submodule: Try to fetch when update fails to find the target commit.
| * | | submodule: Try to fetch when update fails to find the target commit in the ↵Jason Haslam2016-06-281-4/+16
| | |/ | |/| | | | | | | submodule.
View Lorry Controller Status