Log

Author Commit Date CI Message
Carlos Martín Nieto 4f91bfa3 2014-12-05T10:32:59 Find libssh2 via pkg-config We don't really need our own module to find libssh2. Using pkg-config lets the standard tool do the work for us and let us fit more naturally in the workflow as we respect the pkg-config search paths.
Carlos Martín Nieto d43c7bd0 2014-12-05T08:13:43 Rever spelling fixes for dependencies This is not our code and it adds unecessary changes from the upstream code.
nulltoken 30ec0526 2014-12-05T07:44:09 Merge pull request #2744 from epmatsw/spelling Spelling fixes
Carlos Martín Nieto e79fbd9e 2014-12-05T07:09:08 Merge pull request #2743 from ethomson/init_val init: return the number of initializations
Will Stamper b874629b 2014-12-04T21:06:59 Spelling fixes
Edward Thomson 6d91dc53 2014-12-03T15:28:44 init: return the number of initializations
Carlos Martín Nieto 8bfbe698 2014-12-03T21:54:44 Merge pull request #2742 from stewid/add_missing_else_directive Add missing else directive
Stefan Widgren 2d2cd625 2014-12-03T21:01:42 Add missing else directive Add missing else directive to fix compiler warning: control reaches end of non-void function
Carlos Martín Nieto 792d750b 2014-12-03T13:38:48 Merge pull request #2741 from ethomson/fetch-twice win32: clear connection data on close
Edward Thomson 70d21742 2014-12-03T00:41:46 win32: clear connection data on close
Edward Thomson 169497d1 2014-12-01T10:43:11 Merge pull request #2734 from jeffhostetler/jeffhostetler/git_mkfile fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat...
Carlos Martín Nieto fea15f7c 2014-11-30T01:52:22 Merge pull request #2736 from ethomson/describe_errorcode describe: check error codes
Edward Thomson 32e2b758 2014-11-29T15:57:35 describe: check error codes
Jeff Hostetler 93aef71e 2014-11-26T14:12:11 fix cl_git_mkfile() to test for -1 rather than 0 for errors from p_creat()
Edward Thomson 53e48b37 2014-11-23T17:28:26 Merge pull request #2727 from libgit2/cmn/travis-jobs Regain non-threadsafe builds and make the valgrind build failable
Edward Thomson e952bc5a 2014-11-23T17:15:18 Merge pull request #2718 from libgit2/cmn/peeling-errors peel: reject bad queries with EPEEL
Carlos Martín Nieto f7fcb18f 2014-11-23T14:12:54 Plug leaks Valgrind is now clean except for libssl and libgcrypt.
Carlos Martín Nieto 753e17b0 2014-11-19T18:42:29 peel: reject bad queries with EINVALIDSPEC There are some combination of objects and target types which we know cannot be fulfilled. Return EINVALIDSPEC for those to signify that there is a mismatch in the user-provided data and what the object model is capable of satisfying. If we start at a tag and in the course of peeling find out that we cannot reach a particular type, we return EPEEL.
Carlos Martín Nieto 1dbb74ba 2014-11-22T18:46:17 Travis: do non-threadsafe builds When flipping the default to threadsafe, we never made sure that the tests were building non-threadsafe variants. Specify which thead-safety we want for each.
Carlos Martín Nieto 60f3e876 2014-11-22T18:42:00 Travis: move the valgrind run to allowed_failures We don't need to know the result of the travis run before determining whether we want to consider the merge as successful.
Carlos Martín Nieto e06b1040 2014-11-22T18:39:50 Merge pull request #2723 from ravindp/ravindp/fix_4_missing_delta_bases Fix for misleading "missing delta bases" error.
Ravindra Patel ec7e680c 2014-11-20T12:07:55 Fix for misleading "missing delta bases" error - Fix #2721.
Edward Thomson e0482934 2014-11-21T13:16:42 Merge pull request #2725 from libgit2/vmg/attr-null Do not assume blob contents are NULL terminated
Vicent Marti 24cce239 2014-11-21T18:09:57 text: Null-terminate a string if we've been gouging it
Vicent Marti b7fb71e3 2014-11-21T17:38:55 notes: Use `git__strndup`
Vicent Marti 2e1e0f10 2014-11-21T17:24:55 blame: Do not assume blob contents are NULL-terminated
Vicent Marti 1ba48b7c 2014-11-21T17:19:41 notes: Do not assume blob contents are NULL-terminated
Vicent Marti 72d00241 2014-11-21T13:32:21 attr_file: Do not assume ODB data is NULL-terminated That's a bad assumption to make, even though right now it holds (because of the way we've implemented decompression of packfiles), this may change in the future, given that ODB objects can be binary data. Furthermore, the ODB object can return a NULL pointer if the object is empty. Copying the NULL pointer to the strbuf lets us handle it like an empty string. Again, the NULL pointer is valid behavior because you're supposed to check the *size* of the object before working on it.
Vicent Marti 92e0b679 2014-11-21T13:31:30 buffer: Do not `put` anything if len is 0
Edward Thomson 6f446176 2014-11-21T10:59:20 Merge pull request #2710 from Therzok/shellcheckScripts Run shell scripts through shellcheck
Carlos Martín Nieto deadc43e 2014-11-21T15:21:00 Merge pull request #2720 from ravindp/master Fix for memory leak issue in indexer.c, that surfaces on windows
Vicent Marti c89f1cf9 2014-11-21T14:18:32 Merge pull request #2724 from libgit2/vmg/empty odb: `git_odb_object` contents are never NULL
Vicent Marti e0156651 2014-11-21T13:50:46 odb: `git_odb_object` contents are never NULL This is a contract that we made in the library and that we need to uphold. The contents of a blob can never be NULL because several parts of the library (including the filter and attributes code) expect `git_blob_rawcontent` to always return a valid pointer.
Ungureanu Marius a4fccbbf 2014-11-17T07:01:40 Run shell scripts through shellcheck
Vicent Marti fc6ac074 2014-11-20T13:13:46 Merge pull request #2713 from libgit2/jamill/push_fetch_first Update message for error during push
Vicent Marti fd10b110 2014-11-20T13:12:49 Merge pull request #2717 from libgit2/cmn/remote-ls Clarify the git_remote_ls() documentation
Vicent Marti 21361cb7 2014-11-20T13:12:29 Merge pull request #2719 from libgit2/cmn/fetch-twice fetch: clear the connection data on close
Edward Thomson d7674b57 2014-11-19T19:12:59 Merge pull request #2722 from libgit2/cmn/disable-ssh-check travis: disable the cert callback on OSX
Carlos Martín Nieto aa5a06c3 2014-11-20T00:52:52 travis: disable the cert callback on OSX The sshd on OSX has stopped responding to the setting which this test assumes is there, so let's disable it until we can figure out what's happening.
Carlos Martín Nieto 1ca61bdc 2014-11-19T20:53:25 fetch: clear the connection data on close When we fetch twice with the same remote object, we did not properly clear the connection flags, so we would leak state from the last connection. This can cause the second fetch with the same remote object to fail if using a HTTP URL where the server redirects to HTTPS, as the second fetch would see `use_ssl` set and think the initial connection wanted to downgrade the connection.
Ravindra Patel 7561f98d 2014-11-19T14:54:30 Fix for memory leak issue in indexer.c, that surfaces on windows
Carlos Martín Nieto 8fd7dd77 2014-11-19T15:49:47 remote: don't say we free the remote on disconnect On disconnect we simply ask the transport to close the connection, we do not free it.
Carlos Martín Nieto 699dfcc3 2014-11-19T15:49:02 remote: clarify which list of references _ls() returns Make it clear that this is not the ls-remote command but a way to access the data we have and how long it's kept around.
Carlos Martín Nieto 4d86caec 2014-11-18T18:32:25 Remove two completed projects from the list
Edward Thomson 93b982b1 2014-11-18T12:12:19 Merge pull request #2654 from linquize/missing-obj Fix missing object in tests/resources/crlf by changing the tail commit
Edward Thomson 45301cca 2014-11-18T11:44:59 Merge pull request #2608 from libgit2/cmn/remote-push Provide a convenience function `git_remote_push()`
Edward Thomson 8b5b814e 2014-11-17T20:10:58 Merge pull request #2671 from swisspol/remote_create_fix Fixed active_refspecs field not initialized on new git_remote objects
Edward Thomson 7f1b73b7 2014-11-17T17:03:55 Merge pull request #2693 from libgit2/cmn/push-refspec-refactor push: use the common refspec parser
Edward Thomson a4221ccb 2014-11-17T16:36:54 Merge pull request #2699 from swisspol/fix_warnings Fixed a couple Clang warnings
Jameson Miller a03f6caf 2014-11-17T16:30:31 Update message for error during push When attempting to update a reference on a remote during push, and the reference on the remote refers to a commit that does not exist locally, then we should report a more clear error message.
Pierre-Olivier Latour d3cd7da5 2014-10-28T20:56:18 Fixed active_refspecs field not initialized on new git_remote objects When creating a new remote, contrary to loading one from disk, active_refspecs was not populated. This means that if using the new remote to push, git_push_update_tips() will be a no-op since it checks the refspecs passed during the push against the base ones i.e. active_refspecs. And therefore the local refs won't be created or updated after the push operation.
Carlos Martín Nieto 5915d700 2014-11-17T14:28:22 branch: consider an empty upstream remote config as not found
Carlos Martín Nieto 8aa70737 2014-11-17T14:03:50 Merge branch 'openssl-lock-free'
Ungureanu Marius d6ecc311 2014-11-15T14:35:58 Plug possible leak in the openssl locks
Carlos Martín Nieto ce8822cb 2014-11-15T20:45:17 Merge pull request #2707 from swisspol/fix_include Fixed git2.h not including threads.h anymore
Carlos Martín Nieto 624eb97f 2014-11-15T13:49:15 Merge pull request #2708 from phatblat/pr/threading-doc Fix typo in THREADING.md
Ben Chatelain d698712b 2014-11-14T21:15:42 Fix GCD typo
Pierre-Olivier Latour 889d8c8b 2014-11-15T08:20:36 Fixed git2.h not including threads.h anymore
Pierre-Olivier Latour 692c0408 2014-11-09T08:09:25 Fixed a couple Clang warnings
Carlos Martín Nieto aad638f3 2014-11-07T15:00:11 push: use the common refspec parser There is one well-known and well-tested parser which we should use, instead of implementing parsing a second time. The common parser is also augmented to copy the LHS into the RHS if the latter is empty. The expressions test had to change a bit, as we now catch a bad RHS of a refspec locally.
Carlos Martín Nieto 65f6c1c7 2014-11-09T13:41:57 Merge pull request #2653 from ethomson/contributing Add test information to contributing guidelines
Edward Thomson 057126c6 2014-11-08T18:15:02 Merge pull request #2637 from libgit2/cmn/global-init Rename git_threads_ to git_libgit2_
Carlos Martín Nieto 6eb9e39c 2014-10-10T13:35:57 push: move main test function to git_remote_push() 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.
Carlos Martín Nieto 3149547b 2014-10-10T12:39:53 remote: introduce git_remote_push() 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.
Carlos Martín Nieto 64e3e6d4 2014-10-11T12:25:50 remote: use configured push refspecs if none are given If the user does not pass any refspecs to push, try to use those configured via the configuration or via add_push().
Carlos Martín Nieto 799e22ea 2014-10-23T17:34:41 Rename git_threads_ to git_libgit2_ This describes their purpose better, as we now initialize ssl and some other global stuff in there. Calling the init function is not something which has been optional for a while now.
Edward Thomson 4865cc3f 2014-11-08T17:45:38 Merge pull request #2673 from swisspol/2672 Fixed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0+
Pierre-Olivier Latour e284c451 2014-10-28T22:18:38 Changed GIT_REMOTE_DOWNLOAD_TAGS_ALL to behave like git 1.9.0
Edward Thomson 02bc5233 2014-11-08T17:05:13 Merge pull request #2698 from libgit2/cmn/fetchhead-refactor Refactor fetchhead
Edward Thomson bc8c4a8a 2014-11-08T16:55:23 Merge pull request #2695 from libgit2/cmn/remote-lookup remote: rename _load() to _lookup()
Edward Thomson e3bd48a7 2014-11-08T16:52:43 Merge pull request #2696 from libgit2/cmn/empty-objects odb: hardcode the empty blob and tree
Edward Thomson 09d1408c 2014-11-08T16:49:30 Merge pull request #2694 from Therzok/statusFile git_status_file now takes an exact path.
Carlos Martín Nieto 2c9b9c8b 2014-11-08T20:40:02 remote: refactor the reference-update decision This is an ugly chunk of code, so let's put it into its own function.
Carlos Martín Nieto e1ac0101 2014-11-08T14:40:53 odb: hardcode the empty blob and tree 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.
Carlos Martín Nieto 64fdd86d 2014-11-08T20:21:14 remote: don't check for upstream on an anonymous remote 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.
Carlos Martín Nieto e235db02 2014-11-08T20:09:11 remote: use git_branch_upstream_remote() This reduces the clutter somewhat and lets us see what we're asking about the reference.
Carlos Martín Nieto 82374d98 2014-11-08T20:00:17 branch: add getter for the upstream remote name This gets the value from branch.<foo>.remote.
Carlos Martín Nieto 209425ce 2014-11-08T13:25:51 remote: rename _load() to _lookup() This brings it in line with the rest of the lookup functions.
Ungureanu Marius 68182085 2014-11-07T20:32:50 git_status_file now takes an exact path 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.
Edward Thomson 4e1b3b3b 2014-11-07T09:28:41 Merge pull request #2691 from libgit2/cmn/submodule-and-dir submodules: stale module entries
Carlos Martín Nieto 62a617dc 2014-11-06T16:16:46 iterator: submodules are determined by an index or tree 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.
Carlos Martín Nieto f1a7906f 2014-11-06T11:47:50 submodules: add failing test for stale module entries 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.
Carlos Martín Nieto dd83e602 2014-11-07T08:32:50 Merge pull request #2692 from ethomson/bug2515 checkout_index: handle other stages
Edward Thomson 2d24816b 2014-11-06T18:49:37 checkout_index: Remove stage 0 when checking out conflicts
Edward Thomson 9f664347 2014-11-06T14:40:21 checkout_index: remove conflicts when checking out new files
Edward Thomson 64dc2485 2014-11-06T10:38:25 Merge pull request #2598 from libgit2/cmn/stacked-ignore ignore: don't leak rules into higher directores
Edward Thomson 7bb63991 2014-11-06T10:25:23 Merge pull request #2676 from libgit2/cmn/threading Threading and crypto libraries
Edward Thomson f890a84f 2014-11-06T10:19:22 Merge pull request #2682 from libgit2/cmn/fetch-tags-refspec remote: check for the validity of the refspec when updating FETCH_HEAD
Carlos Martín Nieto 6069042f 2014-11-05T16:51:39 ignore: don't leak rules into higher directories 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.
Carlos Martín Nieto 0798b014 2014-10-04T11:48:50 ignore: add failing test for a file mentioning the parent When we mention "src" in src/.gitignore, we wrongly consider src/ itself to be ignored.
Edward Thomson b4e5432f 2014-11-05T10:47:19 Merge pull request #2688 from libgit2/cmn/ignore-file-trailing-cr ignore: consider files with a CR in their names
Carlos Martín Nieto 5c54e216 2014-11-05T16:07:07 ignore: consider files with a CR in their names 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.
Carlos Martín Nieto 3f8d005a 2014-11-03T22:27:11 Merge pull request #2686 from ethomson/rename_notfound Propogate GIT_ENOTFOUND from git_remote_rename
Edward Thomson cce27d82 2014-11-03T14:07:20 git_remote_rename: propogate GIT_ENOTFOUND
Edward Thomson de0c4555 2014-11-03T11:32:47 Merge pull request #2679 from jfultz/missing-include Make config reading continue after hitting a missing include file.
Carlos Martín Nieto 6d20006f 2014-11-02T20:11:54 remote: check the relevance of the refspec when updating FETCH_HEAD 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.
Edward Thomson 0a629181 2014-11-03T15:10:14 Merge pull request #2661 from swisspol/2656 Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
Edward Thomson 4bb87087 2014-11-03T15:01:41 Merge pull request #2683 from libgit2/cmn/remote-unify remote: unify the creation code
Edward Thomson 873eb899 2014-11-03T14:57:39 Merge pull request #2680 from libgit2/cmn/invalid-cert-return netops: return GIT_ECERTIFICATE when it fails the basic tests
Edward Thomson 0fab748e 2014-11-03T14:52:34 Merge pull request #2685 from libgit2/cmn/mmap-readable Fix segmentation fault observed on OpenBSD/sparc64