summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* diff: fail generation if a file changes sizeethomson/fix-stale-filesize-crashEdward Thomson2022-02-111-4/+4
* diff: provide a flag for whether size is knownEdward Thomson2022-02-115-3/+34
* oid: make empty tree id globalEdward Thomson2022-02-112-4/+6
* diff_file: test empty workdir file grows after obtaining a diffEdward Thomson2022-02-111-1/+28
* diff_file: test workdir file becomes empty after obtaining a diffIliyas Jorio2022-02-111-0/+29
* diff_file: Apply suggestions from code review Iliyas Jorio2022-02-111-3/+3
* diff_file: fix crash if size of diffed file changes in workdirIliyas Jorio2022-02-112-3/+89
* Merge pull request #6205 from ccstolley/ccs_fix_http_push_timeoutEdward Thomson2022-02-083-2/+8
|\
| * Rename prepare_pack() to git_packbuilder__prepare()Colin Stolley2022-02-082-3/+3
| * Update src/pack-objects.hColin Stolley2022-02-081-1/+1
| * push: Prepare pack before sending pack header.Colin Stolley2022-02-073-1/+7
* | Merge pull request #6206 from libgit2/ethomson/odb_write_failuresEdward Thomson2022-02-081-3/+3
|\ \
| * | odb: check for write failuresEdward Thomson2022-02-071-3/+3
|/ /
* | Merge pull request #6192 from libgit2/ethomson/sha256_preparationEdward Thomson2022-02-0624-131/+228
|\ \
| * | packbuilder: use the packfile name instead of hashEdward Thomson2022-01-276-17/+44
| * | indexer: use a byte array for checksumEdward Thomson2022-01-275-31/+53
| * | index: use a byte array for checksumEdward Thomson2022-01-274-48/+55
| * | config: use a byte array for checksumEdward Thomson2022-01-271-5/+6
| * | commit_graph: use a byte array for checksumEdward Thomson2022-01-272-12/+20
| * | midx: use a byte array for checksumEdward Thomson2022-01-272-13/+21
| * | hash: introduce git_hash_fmtEdward Thomson2022-01-272-0/+18
| * | oid: avoid `tostr_s` in many placesEdward Thomson2022-01-272-2/+8
| * | commit_graph: tests are now `commitgraph`Edward Thomson2022-01-271-3/+3
* | | Merge pull request #6196 from libgit2/ethomson/at_revparseEdward Thomson2022-02-032-0/+10
|\ \ \
| * | | revparse: support bare '@'Edward Thomson2022-01-302-0/+10
* | | | Merge pull request #6200 from boretrk/c90Edward Thomson2022-02-032-6/+19
|\ \ \ \
| * | | | C90: add inline macro to xdiff and mbedtlsPeter Pettersson2022-02-032-6/+19
|/ / / /
* | | | Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_commentEdward Thomson2022-02-024-13/+13
|\ \ \ \
| * | | | merge: comment conflicts lines in MERGE_MSGEdward Thomson2022-01-304-13/+13
| |/ / /
* | | | Merge pull request #6195 from libgit2/ethomson/zdiff3Edward Thomson2022-02-0222-403/+635
|\ \ \ \
| * | | | merge: support zdiff3 conflict stylesEdward Thomson2022-01-307-2/+141
| * | | | xdiff: include new xdiff from gitEdward Thomson2022-01-3016-401/+494
| | |/ / | |/| |
* | | | Merge pull request #6198 from libgit2/ethomson/actionsEdward Thomson2022-01-312-43/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | ci: improve the name in CI runsEdward Thomson2022-01-312-43/+43
|/ / /
* | | Merge pull request #6153 from arroz/fix/apple-static-libEdward Thomson2022-01-302-1/+3
|\ \ \
| * | | Introduced `LINK_WITH_STATIC_LIBRARIES` per PR comments.Miguel Arroz2022-01-092-1/+3
| * | | Merge branch 'libgit2:main' into fix/apple-static-libMiguel Arroz2022-01-0711-5/+176
| |\ \ \
| * | | | Disabling setting `CMAKE_FIND_LIBRARY_SUFFIXES` on Apple platforms.Miguel Arroz2021-12-291-1/+1
* | | | | Merge branch 'boretrk/futils_mktmp'Edward Thomson2022-01-304-19/+57
|\ \ \ \ \
| * | | | | futils: document mktmp's safetyEdward Thomson2022-01-301-2/+10
| * | | | | futils_mktmp: don't use umask.Peter Pettersson2022-01-162-17/+21
| * | | | | tests: verify that futils_mktmp respects umaskPeter Pettersson2022-01-141-0/+26
| | |/ / / | |/| | |
* | | | | Merge pull request #6185 from boretrk/noextEdward Thomson2022-01-302-1/+1
|\ \ \ \ \
| * | | | | Remove stray '// TODO'Peter Pettersson2022-01-301-1/+0
| * | | | | cmake: disable some gnu extensionsPeter Pettersson2022-01-301-0/+1
|/ / / / /
* | | | | Merge pull request #6138 from ccstolley/ccs_packedrefs_fastEdward Thomson2022-01-307-32/+334
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fix compiler warning on Windows.Colin Stolley2022-01-131-2/+2
| * | | | Check packed-refs filestamp before reusing mmap.Colin Stolley2022-01-131-1/+8
| * | | | On windows, copy file into memory instead of mmap.Colin Stolley2022-01-131-8/+31
| * | | | Drop redundant check in packed_set_peeling_mode().Colin Stolley2022-01-131-4/+0
View Lorry Controller Status