summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* cmake: drop unset `SHA1_TYPE`ethomson/sha1dcEdward Thomson2017-03-031-2/+2
| | | | We never set `SHA1_TYPE` to `builtin`. Don't bother testing for it.
* hash: test for sha1 collision attack detectionEdward Thomson2017-03-033-0/+70
|
* hash: include sha1collisiondetectionEdward Thomson2017-03-039-3/+1739
| | | | | Include the SHA1 collision attack detection library from https://github.com/cr-marcstevens/sha1collisiondetection
* hash: rename implementation selection constantsEdward Thomson2017-03-032-6/+6
|
* Merge pull request #4148 from pks-t/pks/fix-haiku-buildsPatrick Steinhardt2017-03-011-1/+4
|\ | | | | cmake: only enable supported compiler warning flags
| * cmake: only enable supported compiler warning flagsPatrick Steinhardt2017-03-011-1/+4
|/ | | | | | | | | | We currently unconditionally enable the "-Wall" and "-Wextra" flags. Some platforms rely on compilers which do not support these flags, though. One of these platforms is Haiku, which does not support "-Wextra" due to being stuck on GCC version 2. Fix builds on such platforms by adding these flags only if supported by the compiler.
* Merge pull request #4145 from pks-t/pks/refs-create-memleakPatrick Steinhardt2017-03-011-1/+1
|\ | | | | tests: refs::create: fix memory leak
| * tests: refs::create: fix memory leakPatrick Steinhardt2017-03-011-1/+1
|/
* Merge pull request #4143 from richardipsum/issue-4094Patrick Steinhardt2017-03-012-2/+56
|\ | | | | Fix: make reflog include "(merge)" for merge commits
| * Add test for inclusion of (merge) in reflogRichard Ipsum2017-02-281-1/+43
| | | | | | | | | | This test ensures that the string '(merge)' is included in the reflog when a merge commit is made.
| * Fix: make reflog include "(merge)" for merge commitsRichard Ipsum2017-02-271-1/+13
| | | | | | | | This fixes issue #4094
* | Merge pull request #4138 from richardipsum/symbolic-create-arbitrary-tgt-testEdward Thomson2017-02-261-5/+54
|\ \ | | | | | | tests: Add create__symbolic_with_arbitrary_content
| * | Whitespace and style fixesRichard Ipsum2017-02-251-5/+5
| | | | | | | | | | | | | | | Use C style comments as per style guide, and fix mismatching indentation.
| * | tests: Add create__symbolic_with_arbitrary_contentRichard Ipsum2017-02-251-0/+49
| | | | | | | | | | | | | | | | | | | | | This test ensures that it's possible to create a symbolic ref that has arbitrary data as its target. It also ensures it's possible to obtain the target of that symbolic reference from the git_reference object.
* | | Merge pull request #4142 from pblesi/patch-1Edward Thomson2017-02-261-2/+2
|\ \ \ | | | | | | | | Fix minor typos in CONVENTIONS.md
| * | | Fix minor typos in CONVENTIONS.mdPatrick Blesi2017-02-251-2/+2
| | |/ | |/|
* | | Merge pull request #4141 from kainjow/patch-2Edward Thomson2017-02-261-2/+2
|\ \ \ | |/ / |/| | Fix inet_pton tests triggering an assert in Haiku
| * | Fix inet_pton tests triggering an assert in HaikuKevin Wojniak2017-02-251-2/+2
|/ / | | | | Haiku will assert in a nightly build if the "dst" input to inet_pton() is NULL.
* | Merge pull request #4137 from libgit2/ethomson/appveyorEdward Thomson2017-02-252-2/+5
|\ \ | |/ |/| appveyor: don't rewrite the system mingw
| * appveyor: don't rewrite system mingwethomson/appveyorEdward Thomson2017-02-241-2/+4
| | | | | | | | | | Download mingw-w64 into our build directory and execute it there, don't try to overwrite the system's mingw.
| * appveyor: always build the 'appveyor' branchEdward Thomson2017-02-241-0/+1
|/ | | | The 'appveyor' branch is useful for testing AppVeyor builds.
* Merge pull request #4133 from stinb/khash-cleanup-regressionPatrick Steinhardt2017-02-241-3/+3
|\ | | | | fix regression from #4092
| * pack: fix looping over cache entriesJason Haslam2017-02-221-3/+3
| | | | | | | | | | | | Fixes a regression from #4092. This is a crash on 32-bit and I assume that it doesn't do the right thing on 64-bit either. MSVC emits a warning for this, but of course, it's easy to get lost among all of the similar 'possible loss of data' warnings.
* | Merge pull request #4131 from pks-t/pks/attrcache-cleanupsCarlos Martín Nieto2017-02-222-10/+10
|\ \ | | | | | | Attrcache cleanups
| * | attrcache: remove useless `do_init` indirectionPatrick Steinhardt2017-02-212-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove useless indirection from `git_attr_cache__init` to `git_attr_cache__do_init`. The difference is that the `git_attr_cache__init` macro first checks if the cache is already initialized and, if so, not call `git_attr_cache__do_init`. But actually, `git_attr_cache__do_init` already does the same thing and returns immediately if the cache is already initialized. Remove the indirection.
| * | attrcache: replace existing file entry with `git__swap`Patrick Steinhardt2017-02-211-2/+5
| | | | | | | | | | | | | | | | | | | | | When doing an upsert of a file, we used to use `git__compare_and_swap`, comparing the entry's file which is to be replaced with itself. This can be more easily formulated by using `git__swap`, which unconditionally replaces the value.
| * | attrcache: do not lock/unlock the mutex directlyPatrick Steinhardt2017-02-211-3/+3
| |/ | | | | | | | | | | Improve encapsulation by not referencing the attrcache mutex directly but instead using the `attr_cache_lock` and `attr_cache_unlock` functions.
* | Merge pull request #4135 from libgit2/ethomson/ancient_gcc_not_threadsafeCarlos Martín Nieto2017-02-221-0/+6
|\ \ | |/ |/| Provide error on gcc < 4.1 when THREADSAFE
| * Provide error on gcc < 4.1 when THREADSAFEethomson/ancient_gcc_not_threadsafeEdward Thomson2017-02-221-0/+6
|/ | | | | | | | Provide a descriptive error message when compiling THREADSAFE on gcc versions < 4.1. We require the atomic primitives (eg `__sync_synchronize`) that were introduced in that version. (Note, clang setes `__GNUC__` but appears to set its version > 4.1.)
* Merge pull request #4130 from libgit2/ethomson/clar_messagesEdward Thomson2017-02-177-24/+36
|\ | | | | Improve clar messages
| * `cl_git_exec` -> `cl_git_expect`ethomson/clar_messagesEdward Thomson2017-02-174-11/+11
| |
| * tests: provide better pass/failure error messagesEdward Thomson2017-02-176-23/+35
| | | | | | | | | | | | Provide more detailed messages when conditions pass or fail unexpectedly. In particular, this provides the error messages when a test fails with a different error code than was expected.
| * p_snprintf: no need for arguments to a formatEdward Thomson2017-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `snprintf` requires a _format_ but does not require _arguments_ to the format. eg: `snprintf(buf, 42, "hi")` is perfectly legal. Expand the macro to match. Without this, `p_sprintf(buf, 42, "hi")` errors with: ``` error: expected expression p_snprintf(msg, 42, "hi"); ^ src/unix/posix.h:53:34: note: expanded from macro 'p_snprintf' ^ /usr/include/secure/_stdio.h:57:73: note: expanded from macro 'snprintf' __builtin___snprintf_chk (str, len, 0, __darwin_obsz(str), __VA_ARGS__) ```
* | Merge pull request #4092 from pks-t/pks/khash-cleanupsPatrick Steinhardt2017-02-1733-347/+610
|\ \ | |/ |/| khash cleanups
| * idxmap: remove GIT__USE_IDXMAPPatrick Steinhardt2017-02-173-23/+14
| |
| * idxmap: convert to use functions instead of macrosPatrick Steinhardt2017-02-172-43/+143
| |
| * offmap: remove GIT__USE_OFFMAP macroPatrick Steinhardt2017-02-173-6/+1
| |
| * offmap: convert to use functions instead of macrosPatrick Steinhardt2017-02-172-23/+97
| |
| * oidmap: remove GIT__USE_OIDMAP macroPatrick Steinhardt2017-02-1710-25/+7
| |
| * oidmap: convert macros to functionsPatrick Steinhardt2017-02-172-22/+115
| |
| * strmap: remove GIT__USE_STRMAP macroPatrick Steinhardt2017-02-1716-31/+1
| |
| * strmap: convert macros to functionsPatrick Steinhardt2017-02-172-27/+112
| |
| * khash: avoid using `kh_resize` directlyPatrick Steinhardt2017-02-172-6/+7
| |
| * khash: avoid using macro magic to get return addressPatrick Steinhardt2017-02-1718-37/+37
| |
| * khash: avoid using `kh_key`/`kh_val` as lvaluePatrick Steinhardt2017-02-1710-17/+20
| |
| * khash: avoid using `kh_put` directlyPatrick Steinhardt2017-02-1711-11/+17
| |
| * khash: avoid using `kh_del` directlyPatrick Steinhardt2017-02-173-4/+5
| |
| * khash: avoid using `kh_key` directlyPatrick Steinhardt2017-02-174-6/+5
| |
| * khash: avoid using `kh_val`/`kh_value` directlyPatrick Steinhardt2017-02-178-23/+23
| |
| * khash: avoid using `kh_exist` directlyPatrick Steinhardt2017-02-172-1/+2
| |
View Lorry Controller Status