Log

Author Commit Date CI Message
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
Edward Thomson 2cc6011e 2014-11-03T14:49:56 Merge pull request #2684 from jacquesg/openssl-windows Make the Visual Studio compiler happy
Stefan Sperling aad0bd6b 2014-11-03T13:46:56 Fix segmentation fault observed on OpenBSD/sparc64 A non-readable mapping of a file causes an access violation in the pack tests. Always use PROT_READ to work around this.
Jacques Germishuys bc48bcdc 2014-11-03T14:23:13 Make the Visual Studio compiler happy
John Fultz ebc13b2b 2014-11-02T19:16:49 Clean up issues include.path issues found during code review. * 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.
Carlos Martín Nieto a68e217f 2014-11-02T21:57:14 remote: unify the creation code 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.
Carlos Martín Nieto ea8dedc9 2014-11-02T20:39:29 remote: fix tagopt test An anonymous remote wouldn't create remote-tracking branches, so testing we don't create them for TAGS_ALL is nonsensical. Furthermore, the name of the supposed remote-tracking branch was also not one which would have been created had it had a name. Give the remote a name and test that we only create the tags when we pass TAGS_ALL and that we do create the remote-branch branch when given TAGS_AUTO.
Carlos Martín Nieto 0f838d27 2014-11-02T20:03:23 remote: add a failing test for checking the current branch's upstream When we update FETCH_HEAD we check whether the remote is the current branch's upstream remote. The code does not check whether the current refspec is relevant for this reference but always tries to perform the reverse transformation, which causes it to error out if the refspec doesn't match the reference. Thanks to Pierre-Olivier Latour for the reproduction recipe.
Carlos Martín Nieto 521c0cab 2014-11-02T17:18:19 merge: talk about the merging state after git_merge() Since it's not necessarily obvious, mention the merging state and how to clear it.
Carlos Martín Nieto 22fbb265 2014-11-02T16:12:10 netops: return GIT_ECERTIFICATE when it fails the basic tests 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.
John Fultz 727ae380 2014-11-01T11:21:45 Make config reading continue after hitting a missing include file. 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.
Carlos Martín Nieto fe6b51ae 2014-11-01T10:45:33 ssl: separate locking init from general init Extract the lock-setting functions into their own, as we cannot assume that it's ok for us to set this unconditionally.
Carlos Martín Nieto 15bea02c 2014-10-31T11:24:02 docs: explicitly document the threading caveats Talk about sharing objects and error messages; but the most important part is about what to do with the cryptographic libraries, which sadly have to become to responsibility of the application.
Carlos Martín Nieto e0836577 2014-11-01T10:26:09 ssl: clear the OpenSSL locking function We're freeing the memory which holds the locks so we must make sure that the locking function doesn't try to use it.
Edward Thomson 264d74fd 2014-10-27T15:04:21 Merge pull request #2669 from ethomson/revert_test_fix revert tests: always use core.autocrlf=false in tests
Edward Thomson 53ca45ee 2014-10-27T17:27:25 revert tests: always use core.autocrlf=false in tests
Edward Thomson 7647f449 2014-10-27T12:19:42 Merge pull request #2659 from swisspol/static_analysis Fixed the most obvious Clang static analyzer warnings
Pierre-Olivier Latour 64bcf567 2014-10-26T10:30:05 Fixed potential crash with uninitialized variables
Pierre-Olivier Latour ea66215d 2014-10-26T10:29:19 Removed some useless variable assignments
Pierre-Olivier Latour d88766c4 2014-10-26T10:40:46 Changed context_lines and interhunk_lines to uint32_t to match struct s_xdemitconf
Edward Thomson 116a19d4 2014-10-27T06:33:11 Merge pull request #2666 from libgit2/cmn/threadsafe-on Flip THREADSAFE's default to ON
Carlos Martín Nieto 177a29d8 2014-10-27T10:39:45 Merge commit 'refs/pull/2366/head' of github.com:libgit2/libgit2
Carlos Martín Nieto 79b0ae4e 2014-10-27T10:30:57 Flip THREADSAFE's default to ON Threads are here to stay; and for a while now, users have had to call the initialization function which sets up threads and crypto regardless of whether the library was built threadsafe or not.
Edward Thomson aabe1e5a 2014-10-26T23:36:15 Merge branch 'csware/cleanup'
Sven Strickroth 334a0696 2014-10-26T17:36:14 Minor cleanup: Use defined no_check_cert_flags instead of C&P them again Signed-off-by: Sven Strickroth <email@cs-ware.de>
Edward Thomson b07db1eb 2014-10-26T20:18:04 Merge pull request #2482 from libgit2/ed/rebase Rebase (merge)
Edward Thomson 67917281 2014-10-26T22:37:01 rebase: add information to the CHANGELOG
Edward Thomson 979645a7 2014-10-04T20:17:26 rebase: updates based on PR comments
Edward Thomson 18b00406 2014-10-03T19:02:29 s/git_merge_head/git_annotated_commit Rename git_merge_head to git_annotated_commit, as it becomes used in more operations than just merge.
Edward Thomson 796b03bd 2014-10-03T20:47:48 rebase: clean up some warnings and memory leaks
Edward Thomson e69737d7 2014-09-11T16:46:46 rebase: oid member of operation should be const
Edward Thomson ed2c06a6 2014-09-11T16:47:20 git_rebase: iterators for operations
Edward Thomson f152f8ac 2014-08-26T16:18:46 rebase: preload all operations
Edward Thomson b6b636a7 2014-08-25T13:29:50 rebase: init/open a git_rebase object
Edward Thomson 18b439b9 2014-08-23T18:19:34 git_rebase_next: provide info about the operation
Edward Thomson 5ae9d296 2014-07-21T12:25:03 git_rebase_finish: rewrite notes when finishing rebase
Edward Thomson bad4937e 2014-07-21T10:47:01 Introduce `git_note_author`, `git_note_committer`
Edward Thomson a612a25f 2014-07-18T18:22:54 git_rebase_commit: write HEAD's reflog appropriately
Edward Thomson 517644cc 2014-07-18T17:19:10 Introduce git_rebase_finish to complete a rebase
Edward Thomson 14864fbf 2014-07-18T15:37:42 git_rebase_next: test that we return GIT_ITEROVER
Edward Thomson 93a7004c 2014-07-18T14:50:06 git_rebase_commit: drop already-picked commits 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.
Edward Thomson a35a9890 2014-07-17T18:25:03 Introduce git_rebase_commit Commit the current patch of a rebase process.
Edward Thomson 443d5674 2014-07-17T11:59:01 git_rebase_next: write conflicts nicely during rebase
Edward Thomson 950a7091 2014-07-15T10:23:10 Introduce git_rebase_next `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.
Edward Thomson 4fe84d62 2014-07-14T15:19:19 Introduce git_rebase_abort Abort an in-progress rebase and move the working directory and repository back to the ORIG_HEAD state.
Edward Thomson daf395b7 2014-07-18T17:40:07 git_reset: const the git_signature arg
Edward Thomson 867a36f3 2014-07-14T14:35:01 Introduce git_rebase to set up a rebase session Introduce `git_rebase` to set up a rebase session that can then be continued. Immediately, only merge-type rebase is supported.
Edward Thomson 9e44289c 2014-10-26T19:58:24 Merge pull request #2612 from ethomson/warnings Clean up some warnings
Edward Thomson 5b0c6306 2014-10-26T22:38:30 Remove unused warning on non-win32
Edward Thomson 5a7cd1bc 2014-10-25T19:53:53 iterator: free paths when skipping them
Edward Thomson 4b1b2bd9 2014-10-25T19:53:27 revwalk::mergebase test: free memory
Edward Thomson 8c8ca730 2014-10-25T19:53:07 mwindow: clean up pack map at shutdown
Edward Thomson e4985fe3 2014-10-25T19:52:52 submodule test: free submodule
Edward Thomson 50aae000 2014-10-25T19:52:11 global: clean up openssl_locks on shutdown
Edward Thomson 16288d2d 2014-10-25T19:51:46 clone::local test: isalpha -> git__isalpha
Edward Thomson 90aa2bf3 2014-10-25T19:51:12 config test: clean up memory leak
Edward Thomson bc42479a 2014-10-13T15:43:03 Cleanup memory leak in ssh transport
Edward Thomson cdd71711 2014-10-13T14:34:32 Clean up some memory leaks
Edward Thomson 369b0217 2014-10-13T13:34:15 Clean up various compiler warnings
Carlos Martín Nieto 70f7e2c6 2014-10-27T01:48:37 Merge from 2660
Carlos Martín Nieto fad0aea9 2014-10-27T01:47:40 tests: fix leak
Linquize 9223f288 2014-10-27T01:06:28 Fix test repo dir not deleted after running
Edward Thomson d09458f3 2014-10-24T16:52:39 Merge pull request #2638 from libgit2/cmn/config-refresh-remove config: remove the refresh function and backend field
Edward Thomson 725cd5f2 2014-10-24T16:44:07 Merge pull request #2646 from libgit2/cmn/remote-rename remote: accept a repo and name for renaming
Edward Thomson b8041215 2014-10-24T14:02:53 Merge pull request #2649 from swisspol/2630 Fixed memory leak in git_tag_delete()
Edward Thomson a747ea49 2014-10-24T14:01:13 Merge pull request #2647 from ethomson/clar_tmpname clar: use a custom temp directory name
Edward Thomson cdfd2b62 2014-10-24T08:27:38 Merge pull request #2645 from libgit2/cmn/common-crypto [RFC] Use CommonCrypto for hashing
Pierre-Olivier Latour 1ad15540 2014-10-24T08:23:14 Fixed memory leak in git_tag_delete()
Edward Thomson 29eed1c7 2014-10-24T10:50:57 clar: use a custom temp directory name
Edward Thomson 27372263 2014-10-24T07:39:10 Merge pull request #2644 from libgit2/cmn/remove-supported-url remote: delete git_remote_supported_url()
Carlos Martín Nieto 46c8f7f8 2014-10-24T16:25:59 remote: accept a repo and name for renaming 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.
Carlos Martín Nieto 0862f617 2014-10-24T12:19:13 remote: delete git_remote_supported_url() This function does not in fact tell us anything, as almost anything with a colon in it is a valid rsync-style SSH path; it can not tell us that we do not support ftp or afp or similar as those are still valid SSH paths and we do support that.
Carlos Martín Nieto d9c0dbb0 2014-10-24T13:29:11 hash: use CommonCrypto on OSX for SHA-1 OSX has its own cryptographic library, let's make use of it instead of calling out to OpenSSL.
Carlos Martín Nieto 55cb4999 2014-10-23T19:05:02 config: remove the refresh function and backend field 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.
Carlos Martín Nieto 4bb6ffb6 2014-10-23T18:58:39 Merge pull request #2622 from libgit2/refresh-config-snapshot Refresh git configuration before looking for the tracking branch redux.
Edward Thomson d676af43 2014-10-23T08:27:13 Merge pull request #2625 from libgit2/cmn/ssl-tls ssl: dump the SSL ciphers in favour of TLS
Carlos Martín Nieto f0f97370 2014-10-18T15:52:10 ssl: dump the SSL ciphers in favour of TLS All versions of SSL are considered deprecated now, so let's ask OpenSSl to only use TLSv1. We still ask it to load those ciphers for compatibility with servers which want to use an older hello but will use TLS for encryption. For good measure we also disable compression, which can be exploitable, if the OpenSSL version supports it.
Alan Rogers ad5adacb 2014-10-21T09:29:45 Patch from @carlosmn to refresh the parent config before snapshotting.
Alan Rogers 1e2fe921 2014-10-21T09:29:17 Change the length of the file so that the change is picked up.
Alan Rogers 5490c9d4 2014-10-16T13:52:55 Add a test to make sure a new snapshot has the new value.
Edward Thomson 943fde7f 2014-10-22T20:48:04 Merge pull request #2617 from linquize/describe-example describe: add example