delta/libgit2.git/src, branch ethomson/ci_libssh2 github.com: libgit2/libgit2.git Merge remote-tracking branch 'mathworks/longpath_filter_bug' into main 2021-09-20T13:06:50+00:00 Edward Thomson ethomson@edwardthomson.com 2021-09-20T13:06:50+00:00 482e3853536c40acf4e6dc31f230efaa93bef374 






Merge pull request #6058 from mathworks/proxy_config_with_detached_remote
2021-09-20T12:39:46+00:00

Edward Thomson
ethomson@edwardthomson.com

2021-09-20T12:39:46+00:00

0644c2e8c54784800f27ee7b389eccaff6745755

Allow proxy options when connecting with a detached remote.




Allow proxy options when connecting with a detached remote.






Update remote.c
2021-09-18T20:08:20+00:00

Laurence McGlashan
mail@laurencemcglashan.com

2021-09-18T20:08:20+00:00

3bd462a113a9bbf4fb6e61c56c3a32ac3636b664

Initialise cfg variable.




Initialise cfg variable.






Apply suggestions from code review
2021-09-18T20:00:48+00:00

Laurence McGlashan
mail@laurencemcglashan.com

2021-09-18T20:00:48+00:00

c8823fb05097cf38fa7f5cce0929e63c186f7a21

Co-authored-by: Edward Thomson <ethomson@github.com>




Co-authored-by: Edward Thomson <ethomson@github.com>






Allow proxy options when connecting with a detached remote.
2021-09-16T10:44:04+00:00

Laurence McGlashan
laurence.mcglashan@gmail.com

2021-09-16T10:44:04+00:00

eb41276fe08eeedd27509f69d9465cfbdd6cb7f7












merge: Check file mode when resolving renames.
2021-09-15T22:09:17+00:00

Colin Stolley
ccstolley@github.com

2021-09-09T20:21:48+00:00

479a38bf153f13966a423124994e4ed91561e595

When determining if ours or theirs changed, we check the oids but not
their respective file modes. This can lead to merges introducing incorrect
file mode changes (eg., in a revert). A simple linear example might be:

commit A - introduces file `foo` with chmod 0755
commit B - updates some unrelated file
commit C - renames `foo` to `bar` and chmod 0644

If B is reverted, `bar` will unexpectedly acquire mode 0755.





When determining if ours or theirs changed, we check the oids but not
their respective file modes. This can lead to merges introducing incorrect
file mode changes (eg., in a revert). A simple linear example might be:

commit A - introduces file `foo` with chmod 0755
commit B - updates some unrelated file
commit C - renames `foo` to `bar` and chmod 0644

If B is reverted, `bar` will unexpectedly acquire mode 0755.







Merge pull request #6053 from stac47/ssh2_discovery
2021-09-14T13:53:15+00:00

Edward Thomson
ethomson@edwardthomson.com

2021-09-14T13:53:15+00:00

7d195b9c3ddffb9f9af94dcabaeb4fc77fafa378

Discover libssh2 without pkg-config




Discover libssh2 without pkg-config






Update src/CMakeLists.txt
2021-09-14T11:53:29+00:00

Laurent Stacul
laurent.stacul@gmail.com

2021-09-14T11:53:29+00:00

413bfb83b2dfde9482a756fbcd1d5f5ba9315696

Co-authored-by: Edward Thomson <ethomson@github.com>




Co-authored-by: Edward Thomson <ethomson@github.com>






Merge pull request #6041 from Esri/duncan/typeof
2021-09-14T11:47:19+00:00

Edward Thomson
ethomson@edwardthomson.com

2021-09-14T11:47:19+00:00

646bae34c9962d308ea82c5d03f5862d20fcca02

Use __typeof__ GNUC keyword for ISO C compatibility




Use __typeof__ GNUC keyword for ISO C compatibility






Merge pull request #6039 from lhchavez/avoid-mmap-in-git-indexer-append
2021-09-14T11:46:49+00:00

Edward Thomson
ethomson@edwardthomson.com

2021-09-14T11:46:49+00:00

b6735461d9148a91cfaf4633403843aa88db9001

indexer: Avoid one `mmap(2)`/`munmap(2)` pair per `git_indexer_append` call




indexer: Avoid one `mmap(2)`/`munmap(2)` pair per `git_indexer_append` call