summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* remote: refactor insteadof applicationethomson/insteadofEdward Thomson2021-12-231-34/+28
* 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
| * Add test for `git_worktree_add` no checkoutpunkymaniac2021-12-231-0/+21
| * Change default checkout strategy from FORCE to SAFEpunkymaniac2021-12-231-2/+0
| * Allow user checkout options on git_worktree_addpunkymaniac2021-12-232-2/+10
|/
* Merge pull request #6142 from libgit2/ethomson/blob_data_is_binaryEdward Thomson2021-12-233-0/+37
|\
| * blob: identify binary contentethomson/blob_data_is_binaryEdward Thomson2021-12-103-0/+37
* | Merge pull request #6124 from csware/config-parsingEdward Thomson2021-12-234-5/+66
|\ \
| * | Multiline config values not preserved on savingSven Strickroth2021-12-062-4/+27
| * | Add more tests for contentsSven Strickroth2021-12-061-0/+15
| * | Config parsing confused by continuations that start with quotesSven Strickroth2021-12-063-1/+24
* | | Merge pull request #6125 from stforek/git_commit_summary_spacesEdward Thomson2021-12-232-4/+18
|\ \ \
| * | | git_commit_summary: ignore lines with spacesPrzemyslaw Ciezkowski2021-11-252-4/+18
| |/ /
* | | Merge pull request #6101 from mkhl/fix/instead-ofEdward Thomson2021-12-233-28/+153
|\ \ \
| * | | 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
* | | | Merge pull request #6095 from yoichi/better-compatiblity-for-at-time-notationEdward Thomson2021-12-2312-32/+71
|\ \ \ \
| * \ \ \ Merge branch 'main' into better-compatiblity-for-at-time-notationYoichi Nakayama2021-11-23297-5385/+6264
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | 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
| * | | | 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
|\ \ \ \ \
| * | | | | 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
| * | | | | Also correct this long long constantCalvin Buckley2021-10-181-1/+1
| * | | | | 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_SOURCE_DIR of CMAKE_SOURCE_DIRJosh Junon2021-12-239-29/+29
|/ / / / /
* | | | | Merge pull request #6128 from libgit2/ethomson/object_validationEdward Thomson2021-12-0410-39/+173
|\ \ \ \ \
| * | | | | object: introduce a raw content validation functionethomson/object_validationEdward Thomson2021-11-303-0/+104
| * | | | | object: return GIT_EINVALID on parse errorsEdward Thomson2021-11-308-39/+69
|/ / / / /
* | | | | Merge pull request #6122 from libgit2/ethomson/cleanupEdward Thomson2021-11-3029-70/+60
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | cmake: use CMAKE_SOURCE_DIR and CMAKE_BINARY_DIRethomson/cleanupEdward Thomson2021-11-229-33/+31
| * | | | filebuf: use hashes not oidsEdward Thomson2021-11-224-6/+6
| * | | | sha1: tests should use hashes, not oid computationEdward Thomson2021-11-221-11/+17
| * | | | util: don't include unnecessary system librariesEdward Thomson2021-11-2214-20/+5
| * | | | utf8: include `utf8.h` in testsEdward Thomson2021-11-191-0/+1
* | | | | Merge pull request #6106 from ammgws/fixtemplateerrEdward Thomson2021-11-222-1/+16
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | repo: minor formatting fixEdward Thomson2021-11-221-2/+1
| * | | | tests: try to init with non-existent template pathJason Nader2021-11-121-0/+10
| * | | | repository: do not copy templates if dir nonexistentJason Nader2021-11-121-1/+7
* | | | | Merge pull request #6121 from libgit2/ethomson/dateEdward Thomson2021-11-197-61/+76
|\ \ \ \ \
| * | | | | date: rfc2822 formatting uses a `git_buf` instead of a static stringethomson/dateEdward Thomson2021-11-195-39/+39
| * | | | | date: make it a proper `git_date` utility classEdward Thomson2021-11-187-32/+47
|/ / / / /
* | | | | Merge pull request #6120 from libgit2/ethomson/cmake_testEdward Thomson2021-11-173-3/+2
|\ \ \ \ \
View Lorry Controller Status