summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* config: test allocation in config conditionalsethomson/includeifEdward Thomson2022-01-051-1/+3
|
* config: handle empty conditional in includeIfEdward Thomson2022-01-052-3/+37
| | | | | | When a config file contains `[includeIf]` (with no condition), we should treat that as a falsey value. This means that we should properly parse a config value of `includeIf.path`.
* Merge pull request #6150 from cestrand/patch-1Edward Thomson2021-12-241-2/+0
|\ | | | | Remove PSGit from Language Bindings section of README
| * Remove PSGit from Language Bindings section of READMEMarcin Kolenda2021-12-241-2/+0
|/ | | PSGit is not using libgit2 library. It is stub of a library and is not developed further.
* Merge pull request #6148 from libgit2/ethomson/ciEdward Thomson2021-12-241-1/+2
|\ | | | | ci: build with ssh on nightly
| * ci: build with ssh on nightlyEdward Thomson2021-12-231-1/+2
|/
* Merge pull request #6147 from libgit2/ethomson/insteadofEdward Thomson2021-12-231-34/+28
|\ | | | | remote: refactor insteadof application
| * remote: refactor insteadof applicationethomson/insteadofEdward Thomson2021-12-231-34/+28
|/ | | | | | | Using the insteadof helper would leak memory when we didn't really want the pushInsteadOf configuration. Refactor the choice into the function that allocates memory (or now, not) and use a more idiomatic `int` return code.
* Merge branch 'pr/6062'Edward Thomson2021-12-233-6/+34
|\
| * worktree: checkout options suggestions from code reviewEdward Thomson2021-12-233-8/+8
| |
| * Fix test fail because of memory leakpunkymaniac2021-12-231-0/+1
| |
| * Update test for `git_str` usage instead of `git_buf`punkymaniac2021-12-231-3/+3
| | | | | | | | See commit f0e693b18afbe1de37d7da5b5a8967b6c87d8e53
| * Add test for `git_worktree_add` no checkoutpunkymaniac2021-12-231-0/+21
| |
| * Change default checkout strategy from FORCE to SAFEpunkymaniac2021-12-231-2/+0
| | | | | | | | | | | | Since we are able to give our own git checkout options, the default git checkout strategy will be the same as initialized in a new git_checkout_options struct.
| * Allow user checkout options on git_worktree_addpunkymaniac2021-12-232-2/+10
|/ | | | | | Extend the `git_worktree_add_options` to include `git_checkout_options`. github issue #5949
* Merge pull request #6142 from libgit2/ethomson/blob_data_is_binaryEdward Thomson2021-12-233-0/+37
|\ | | | | blob: identify binary content
| * blob: identify binary contentethomson/blob_data_is_binaryEdward Thomson2021-12-103-0/+37
| | | | | | | | | | Introduce `git_blob_data_is_binary` to examine a blob's data, instead of the blob itself. A replacement for `git_buf_is_binary`.
* | Merge pull request #6124 from csware/config-parsingEdward Thomson2021-12-234-5/+66
|\ \ | | | | | | Config parsing
| * | Multiline config values not preserved on savingSven Strickroth2021-12-062-4/+27
| | | | | | | | | | | | | | | | | | (fixes issue #6088) Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | Add more tests for contentsSven Strickroth2021-12-061-0/+15
| | | | | | | | | | | | Signed-off-by: Sven Strickroth <email@cs-ware.de>
| * | Config parsing confused by continuations that start with quotesSven Strickroth2021-12-063-1/+24
| | | | | | | | | | | | | | | | | | (fixes issue #6089) Signed-off-by: Sven Strickroth <email@cs-ware.de>
* | | Merge pull request #6125 from stforek/git_commit_summary_spacesEdward Thomson2021-12-232-4/+18
|\ \ \ | | | | | | | | git_commit_summary: ignore lines with spaces
| * | | git_commit_summary: ignore lines with spacesPrzemyslaw Ciezkowski2021-11-252-4/+18
| |/ / | | | | | | | | | Fixes libgit2/libgit2#6065
* | | Merge pull request #6101 from mkhl/fix/instead-ofEdward Thomson2021-12-233-28/+153
|\ \ \ | | | | | | | | remotes: fix insteadOf/pushInsteadOf handling
| * | | remote: improve apply_insteadof function signatureMartin Kühl2021-11-111-9/+9
| | | |
| * | | fix remote/insteadof testsMartin Kühl2021-11-111-5/+25
| | | |
| * | | update remote/insteadof testsMartin Kühl2021-11-112-23/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we want to test: - an anonymous repo (a url) - a named repo with a url - a named repo with a url and pushurl and for each of these matching configuration: - only insteadOf - only pushInsteadOf - both insteadOf and pushInsteadOf this change adds test cases for all of these combinations.
* | | | Merge pull request #6095 from yoichi/better-compatiblity-for-at-time-notationEdward Thomson2021-12-2312-32/+71
|\ \ \ \ | | | | | | | | | | Better revparse compatibility for at time notation
| * \ \ \ Merge branch 'main' into better-compatiblity-for-at-time-notationYoichi Nakayama2021-11-23297-5385/+6264
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | Conflicts: src/revparse.c
| * | | | Add TODO comment for emit a warningYoichi Nakayama2021-10-221-0/+3
| | | | |
| * | | | Cause error when date parsing is failedYoichi Nakayama2021-10-224-3/+25
| | | | |
| * | | | Return the oldest reflog entry on revparse when older time is givenYoichi Nakayama2021-10-222-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | For better compatibility with git command which returns the oldest log entry with a warning message.
| * | | | Add a branch with a empty reflog into testrepo.gitYoichi Nakayama2021-10-228-21/+24
| | | | |
* | | | | Merge pull request #6094 from visualgitio/commit-graph-long-longEdward Thomson2021-12-232-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Fix a long long that crept past
| * | | | | Simplifications to definitions to avoid UINT64_CCalvin Buckley2021-12-111-2/+2
| | | | | |
| * | | | | Fix long long constants in macro in ntlmclientCalvin Buckley2021-10-181-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | This should be propagated to upstream.
| * | | | | Also correct this long long constantCalvin Buckley2021-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I missed this because I searched for digits before ULL, otherwise it would match terms like "null" or "fully".
| * | | | | Fix a long long that crept pastCalvin Buckley2021-10-171-1/+1
| | | | | |
* | | | | | Merge pull request #6146 from Qix-/mainEdward Thomson2021-12-239-29/+29
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | cmake: use project-specific root variable instead of CMAKE_SOURCE_DIR
| * | | | | cmake: use PROJECT_SOURCE_DIR of CMAKE_SOURCE_DIRJosh Junon2021-12-239-29/+29
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also applies to *_BINARY_DIR. This effectively reverts 84083dcc8bd41332ccac9d7b537f3e254d79011c, which broke all users of libgit2 that use it as a CMake subdirectory (via `add_subdirectory()`). This is because CMAKE_SOURCE_DIR refers to the root-most CMake directory, which in the case of `add_subdirectory()` is a parent project to libgit2 and thus the paths don't make any sense to the configuration files. Corollary, CMAKE_SOURCE_DIR only makes sense if the CMake project is always the root project - which can rarely be guaranteed. In all honesty, CMake should deprecate and eventually remove CMAKE_SOURCE_DIR and CMAKE_BINARY_DIR. It's been the source of headaches and confusion for years, they're rarely useful over CMAKE_CURRENT_(SOURCE|BINARY)_DIR or PROJECT_(SOURCE|BINARY)_DIR, and they cause a lot of confusing configuration and source code layouts to boot. Any time they are used, they break `add_subdirectory()` almost 100% of the time, cause confusing error messages, and hide subtle bugs.
* | | | | Merge pull request #6128 from libgit2/ethomson/object_validationEdward Thomson2021-12-0410-39/+173
|\ \ \ \ \ | | | | | | | | | | | | Introduce `git_object_rawcontent_is_valid`
| * | | | | object: introduce a raw content validation functionethomson/object_validationEdward Thomson2021-11-303-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users may want to validate raw object content; provide them a function to do so.
| * | | | | object: return GIT_EINVALID on parse errorsEdward Thomson2021-11-308-39/+69
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return `GIT_EINVALID` on parse errors so that direct callers of parse functions can determine when there was a failure to parse the object. The object parser functions will swallow this error code to prevent it from propagating down the chain to end-users. (`git_merge` should not return `GIT_EINVALID` when a commit it tries to look up is not valid, this would be too vague to be useful.) The only public function that this affects is `git_signature_from_buffer`, which is now documented as returning `GIT_EINVALID` when appropriate.
* | | | | Merge pull request #6122 from libgit2/ethomson/cleanupEdward Thomson2021-11-3029-70/+60
|\ \ \ \ \ | |_|_|/ / |/| | | | Minor code cleanups
| * | | | cmake: use CMAKE_SOURCE_DIR and CMAKE_BINARY_DIRethomson/cleanupEdward Thomson2021-11-229-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using the project-specific `libgit2_SOURCE_DIR` and `libgit2_BINARY_DIR` variables, use `CMAKE_SOURCE_DIR` and `CMAKE_BINARY_DIR`.
| * | | | filebuf: use hashes not oidsEdward Thomson2021-11-224-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | The filebuf functions should use hashes directly, not indirectly using the oid functions.
| * | | | sha1: tests should use hashes, not oid computationEdward Thomson2021-11-221-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests that examine sha1 behavior (including collision detection) should test against the hash functionality directly, not indirectly using the oid functions.
| * | | | util: don't include unnecessary system librariesEdward Thomson2021-11-2214-20/+5
| | | | | | | | | | | | | | | | | | | | Remove some unnecessary includes from utility code.
| * | | | utf8: include `utf8.h` in testsEdward Thomson2021-11-191-0/+1
| | | | |
* | | | | Merge pull request #6106 from ammgws/fixtemplateerrEdward Thomson2021-11-222-1/+16
|\ \ \ \ \ | |/ / / / |/| | | | Fix repo init when template dir is non-existent
View Lorry Controller Status