summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* array: fix search for empty arrayscmn/v24-updatesCarlos Martín Nieto2016-10-011-1/+1
| | | | | When the array is empty `cmp` never gets set by the comparison function. Initialize it so we return ENOTFOUND in those cases.
* odb: only provide the empty treeEdward Thomson2016-10-012-22/+16
| | | | | | | 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).
* odb: actually insert the empty blob in testsEdward Thomson2016-10-012-32/+34
|
* mwindow: init mwindow files in git_libgit2_initEdward Thomson2016-10-014-26/+12
|
* cmake: add curl library pathPatrick Steinhardt2016-10-011-0/+1
| | | | | | | | | | | | | | | | | The `PKG_CHECK_MODULES` function searches a pkg-config module and then proceeds to set various variables containing information on how to link to the library. In contrast to the `FIND_PACKAGE` function, the library path set by `PKG_CHECK_MODULES` will not necessarily contain linking instructions with a complete path to the library, though. So when a library is not installed in a standard location, the linker might later fail due to being unable to locate it. While we already honor this when configuring libssh2 by adding `LIBSSH2_LIBRARY_DIRS` to the link directories, we fail to do so for libcurl, preventing us to build libgit2 on e.g. FreeBSD. Fix the issue by adding the curl library directory to the linker search path.
* git_checkout_tree options fixStefan Huber2016-10-012-1/+5
| | | | | | | | According to the reference the git_checkout_tree and git_checkout_head functions should accept NULL in the opts field This was broken since the opts field was dereferenced and thus lead to a crash.
* transports: http: reset `connected` flag when re-connecting transportPatrick Steinhardt2016-10-011-0/+1
| | | | | | | | | | | | | When calling `http_connect` on a subtransport whose stream is already connected, we first close the stream in case no keep-alive is in use. When doing so, we do not reset the transport's connection state, though. Usually, this will do no harm in case the subsequent connect will succeed. But when the connection fails we are left with a substransport which is tagged as connected but which has no valid stream attached. Fix the issue by resetting the subtransport's connected-state when closing its stream in `http_connect`.
* ignore: allow unignoring basenames in subdirectoriesPatrick Steinhardt2016-10-012-16/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10-011-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.
* stransport: make internal functions staticPatrick Steinhardt2016-10-011-8/+8
|
* SecureTransport: handle NULL trust on successCarlos Martín Nieto2016-10-011-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.
* sysdir: use the standard `init` patternEdward Thomson2016-10-012-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.
* refspec: do not set empty rhs for fetch refspecsPatrick Steinhardt2016-10-012-2/+55
| | | | | | | | | | | | | | | | | | | | According to git-fetch(1), "[t]he colon can be omitted when <dst> is empty." So according to git, the refspec "refs/heads/master" is the same as the refspec "refs/heads/master:" when fetching changes. When trying to fetch from a remote with a trailing colon with libgit2, though, the fetch actually fails while it works when the trailing colon is left out. So obviously, libgit2 does _not_ treat these two refspec formats the same for fetches. The problem results from parsing refspecs, where the resulting refspec has its destination set to an empty string in the case of a trailing colon and to a `NULL` pointer in the case of no trailing colon. When passing this to our DWIM machinery, the empty string gets translated to "refs/heads/", which is simply wrong. Fix the problem by having the parsing machinery treat both cases the same for fetch refspecs.
* repository: don't cast to `int` for no reasonEdward Thomson2016-10-011-4/+4
| | | | | And give it a default so that some compilers don't (unnecessarily) complain.
* remote: Handle missing config values when deleting a remoteDavid Turner2016-10-011-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
* blame: do not decrement commit refcount in make_originPatrick Steinhardt2016-10-011-8/+18
| | | | | | | | | | | | | | | | | | | | | | | When we create a blame origin, we try to look up the blob that is to be blamed at a certain revision. When this lookup fails, e.g. because the file did not exist at that certain revision, we fail to create the blame origin and return `NULL`. The blame origin that we have just allocated is thereby free'd with `origin_decref`. The `origin_decref` function does not only decrement reference counts for the blame origin, though, but also for its commit and blob. When this is done in the error case, we will cause an uneven reference count for these objects. This may result in hard-to-debug failures at seemingly unrelated code paths, where we try to access these objects when they in fact have already been free'd. Fix the issue by refactoring `make_origin` such that we only allocate the object after the only function that may fail so that we do not have to call `origin_decref` at all. Also fix the `pass_blame` function, which indirectly calls `make_origin`, to free the commit when `make_origin` failed.
* Fixed bug while parsing INT64_MINKrishna Ram Prakash R2016-10-012-3/+11
|
* Fix repository discovery with ceiling_dirs at current directoryJosh Triplett2016-10-013-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* cmake: do not use -fPIC for MSYS2Patrick Steinhardt2016-10-011-6/+8
| | | | | | | | | The MSYS2 build system automatically compiles all code with position-independent code. When we manually add the -fPIC flag to the compiler flags, MSYS2 will loudly complain about PIC being the default and thus not required. Fix the annoyance by stripping -fPIC in MSYS2 enviroments like it is already done for MinGW.
* README: update "Getting Help" sectionEdward Thomson2016-10-011-11/+23
|
* README: improve contributing paragraphEdward Thomson2016-10-011-3/+9
|
* README: disambiguate what to distribute source ofEdward Thomson2016-10-011-2/+2
| | | | | Indicate that if you make changes to libgit2 that you must distribute the source _to libgit2_, not the source _of your program_.
* threads: add platform-independent thread initialization functionPatrick Steinhardt2016-10-014-32/+32
|
* win32: rename pthread.{c,h} to thread.{c,h}Patrick Steinhardt2016-10-015-7/+7
| | | | | | | | | | The old pthread-file did re-implement the pthreads API with exact symbol matching. As the thread-abstraction has now been split up between Unix- and Windows-specific files within the `git_` namespace to avoid symbol-clashes between libgit2 and pthreads, the rewritten wrappers have nothing to do with pthreads anymore. Rename the Windows-specific pthread-files to honor this change.
* threads: remove now-useless typedefsPatrick Steinhardt2016-10-011-7/+0
|
* threads: remove unused function pthread_num_processors_npPatrick Steinhardt2016-10-012-13/+0
| | | | | The function pthread_num_processors_np is currently unused and superseded by the function `git_online_cpus`. Remove the function.
* threads: split up OS-dependent rwlock codePatrick Steinhardt2016-10-014-43/+31
|
* threads: split up OS-dependent thread-condition codePatrick Steinhardt2016-10-014-20/+17
|
* threads: remove unused function pthread_cond_broadcastPatrick Steinhardt2016-10-013-6/+0
|
* threads: split up OS-dependent mutex codePatrick Steinhardt2016-10-014-26/+23
|
* threads: split up OS-dependent thread codePatrick Steinhardt2016-10-018-45/+37
|
* fix error message SHA truncation in git_odb__error_notfound()Sim Domingo2016-10-011-1/+1
|
* HTTP authentication scheme name is case insensitive.David Brooks2016-10-011-1/+1
|
* checkout: use empty baseline when no indexEdward Thomson2016-10-012-1/+69
| | | | | When no index file exists and a baseline is not explicitly provided, use an empty baseline instead of trying to load `HEAD`.
* documentation: improve docs for `checkout_head`Edward Thomson2016-10-011-0/+7
| | | | | `git_checkout_head` is sadly misunderstood as something that can switch branches. It cannot. Update the documentation to reflect this.
* fetch: Fixed spurious update callback for existing tags.Jason Haslam2016-10-011-1/+5
|
* global: clean up crt only after freeing tls dataPatrick Steinhardt2016-10-011-5/+5
| | | | | | | | | | | | | | The thread local storage is used to hold some global state that is dynamically allocated and should be freed upon exit. On Windows, we clean up the C run-time right after execution of registered shutdown callbacks and before cleaning up the TLS. When we clean up the CRT, we also cause it to analyze for memory leaks. As we did not free the TLS yet this will lead to false positives. Fix the issue by first freeing the TLS and cleaning up the CRT only afterwards.
* tests: fix memory leaks in checkout::typechangePatrick Steinhardt2016-10-011-2/+2
|
* index: fix NULL pointer access in index_remove_entryPatrick Steinhardt2016-10-011-2/+3
| | | | | | | | | | | | When removing an entry from the index by its position, we first retrieve the position from the index's entries and then try to remove the retrieved value from the index map with `DELETE_IN_MAP`. When `index_remove_entry` returns `NULL` we try to feed it into the `DELETE_IN_MAP` macro, which will unconditionally call `idxentry_hash` and then happily dereference the `NULL` entry pointer. Fix the issue by not passing a `NULL` entry into `DELETE_IN_MAP`.
* transports: smart: fix potential invalid memory dereferencesPatrick Steinhardt2016-10-012-0/+12
| | | | | | | | | | | | | | | | | | | | | | | When we receive a packet of exactly four bytes encoding its length as those four bytes it can be treated as an empty line. While it is not really specified how those empty lines should be treated, we currently ignore them and do not return an error when trying to parse it but simply advance the data pointer. Callers invoking `git_pkt_parse_line` are currently not prepared to handle this case as they do not explicitly check this case. While they could always reset the passed out-pointer to `NULL` before calling `git_pkt_parse_line` and determine if the pointer has been set afterwards, it makes more sense to update `git_pkt_parse_line` to set the out-pointer to `NULL` itself when it encounters such an empty packet. Like this it is guaranteed that there will be no invalid memory references to free'd pointers. As such, the issue has been fixed such that `git_pkt_parse_line` always sets the packet out pointer to `NULL` when an empty packet has been received and callers check for this condition, skipping such packets.
* index_read_index: invalidate new paths in tree cacheEdward Thomson2016-10-011-0/+6
| | | | | | When adding a new entry to an existing index via `git_index_read_index`, be sure to remove the tree cache entry for that new path. This will mark all parent trees as dirty.
* test: ensure we can round-trip a written treeEdward Thomson2016-10-011-0/+23
| | | | | Read a tree into an index, write the index, then re-open the index and ensure that we are treesame to the original.
* index_read_index: set flags for path_len correctlyEdward Thomson2016-10-011-0/+3
| | | | Update the flags to reset the path_len (to emulate `index_insert`)
* index_read_index: differentiate on modeEdward Thomson2016-10-011-1/+2
| | | | | Treat index entries with different modes as different, which they are, at least for the purposes of up-to-date calculations.
* index_read_index: reset error correctlyEdward Thomson2016-10-011-0/+2
| | | | | | Clear any error state upon each iteration. If one of the iterations ends (with an error of `GIT_ITEROVER`) we need to reset that error to 0, lest we stop the whole process prematurely.
* round-trip trees through index_read_indexEdward Thomson2016-10-011-0/+32
| | | | | | | Read a tree into an index using `git_index_read_index` (by reading a tree into a new index, then reading that index into the current index), then write the index back out, ensuring that our new index is treesame to the tree that we read.
* win32: clean up unused warnings in DllMainEdward Thomson2016-10-011-0/+3
|
* filebuf: fix uninitialized warningEdward Thomson2016-10-011-1/+1
|
* cleanup: unused warningEdward Thomson2016-10-011-0/+3
|
* Update CMakeLists.txtElan Ruusamäe2016-10-011-1/+1
| | | typo fix
View Lorry Controller Status