- 01 Feb, 2018 1 commit
-
-
Merge example
Patrick Steinhardt committed
-
- 31 Jan, 2018 5 commits
-
-
Honor 'GIT_USE_NSEC' option in `filesystem_iterator_set_current`
Edward Thomson committed -
Use longer conflict markers in recursive merge base
Edward Thomson committed -
Tomás Pollak committed
-
status::renames: test update for APFS (write NFD instead of NFC filename)
Edward Thomson committed -
This should have been part of PR #3638. Without this we still get nsec-related errors, even when using -DGIT_USE_NSEC: error: ‘struct stat’ has no member named ‘st_mtime_nsec’
Tomás Pollak committed
-
- 29 Jan, 2018 3 commits
-
-
Special-casing null OIDs
Edward Thomson committed -
README.md: add notes on how to report security issues
Edward Thomson committed -
Patrick Steinhardt committed
-
- 26 Jan, 2018 2 commits
-
-
The null OID (hash with all zeroes) indicates a missing object in upstream git and is thus not a valid object ID. Add defensive measurements to avoid writing such a hash to the object database in the very unlikely case where some data results in the null OID. Furthermore, add shortcuts when reading the null OID from the ODB to avoid ever returning an object when a faulty repository may contain the null OID.
Patrick Steinhardt committed -
In commit a96d3cc3f (cache-tree: reject entries with null sha1, 2017-04-21), the git.git project has changed its stance on null OIDs in tree objects. Previously, null OIDs were accepted in tree entries to help tools repair broken history. This resulted in some problems though in that many code paths mistakenly passed null OIDs to be added to a tree, which was not properly detected. Align our own code base according to the upstream change and reject writing tree entries early when the OID is all-zero.
Patrick Steinhardt committed
-
- 25 Jan, 2018 11 commits
-
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
Etienne Samson committed
-
odb: export mempack backend
Patrick Steinhardt committed
-
- 22 Jan, 2018 1 commit
-
-
Fixes #4492, #4496.
Adrián Medraño Calvo committed
-
- 21 Jan, 2018 4 commits
-
-
Update the status::renames test to create an NFD format filename in the core.precomposedunicode tests. Previously, we would create an NFC format filename. This was to take advantage of HFS+ filesystems, which always use canonically decomposed formats, and would actually write the filename to disk as an NFD filename. So previously, we could create an NFC filename, but read it normally as an NFD filename. But APFS formats do not force canonically decomposed formats for filenames, so creating an NFC filename does not get converted to NFD. Instead, the filename will be written in NFC format. Our test, therefore, does not work - when we write an NFC filename, it will _remain_ NFC. Update the test to write NFD always. This will ensure that the file will actually be canonically decomposed on all platforms: HFS+, which forces NFD, and APFS, which does not. Thus, our test will continue to ensure that an NFD filename is canonically precomposed on all filesystems.
Edward Thomson committed -
Edward Thomson committed
-
Git uses longer conflict markers in the recursive merge base - two more than the default (thus, 9 character long conflict markers). This allows users to tell the difference between the recursive merge conflicts and conflicts between the ours and theirs branches. This was introduced in git d694a17986a28bbc19e2a6c32404ca24572e400f. Update our tests to expect this as well.
Edward Thomson committed -
Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.
Edward Thomson committed
-
- 20 Jan, 2018 3 commits
-
-
branch: refuse creating branches named 'HEAD'
Edward Thomson committed -
refs: include " sorted " in our packed-refs header
Edward Thomson committed -
message: update docs for git_message_prettify
Edward Thomson committed
-
- 19 Jan, 2018 3 commits
-
-
tests: online::clone: fix memory leak due to not freeing URL
Carlos Martín Nieto committed -
Since a625b092c (branch: correctly reject refs/heads/{-dash,HEAD}, 2017-11-14), which is included in v2.16.0, upstream git refuses to create branches which are named HEAD to avoid ambiguity with the symbolic HEAD reference. Adjust our own code to match that behaviour and reject creating branches names HEAD.
Patrick Steinhardt committed -
We used to hard-code the octothorpe as the comment character and the documentation still mentions this even though we accept the comment character as a parameter. Update the line to indicate this and clean up the first paragraph a bit.
Carlos Martín Nieto committed
-
- 18 Jan, 2018 1 commit
-
-
Patrick Steinhardt committed
-
- 17 Jan, 2018 6 commits
-
-
Implement message trailer parsing API
Brian Lopez committed -
Brian Lopez committed
-
Memory leaks
Carlos Martín Nieto committed -
Brian Lopez committed
-
Brian Lopez committed
-
Brian Lopez committed
-