about summary refs log tree commit diff stats
Commit message (Collapse)AuthorAge
* Move my configured makefile stuff to cgit.confCase Duckworth2022-06-09
| | | | | | | I was thinking about keeping cgit.conf ignored and just putting everything in master, but remembered that I have a bunch of other files in this configured branch that need to stay too. So I've un-ignored cgit.conf to keep my changes, but moved the customizations over there for easier editing.
* Merge branch 'master' into configuredCase Duckworth2022-06-09
|\
| * Un-fuck the patchCase Duckworth2022-06-09
| |
* | Update cgitrcCase Duckworth2022-06-09
| |
* | Merge branch 'master' into configuredCase Duckworth2022-06-09
|\|
| * Apply default-tab patch masterCase Duckworth2022-06-09
| |
* | Add file-local variablesCase Duckworth2022-06-09
| |
* | Apply my personal configurations to cgitCase Duckworth2022-06-09
|/ | | | | For easy deployment. Actual code changes will go in master for sharing, but then will be merged here.
* Bump version to 1.4.1June McEnroe2022-05-17
|
* Fix bad free in cgit_diff_treeJune McEnroe2022-05-17
| | | | | | | | | Since git commit 244c27242f44e6b88e3a381c90bde08d134c274b, > diff.[ch]: have diff_free() call clear_pathspec(opts.pathspec) calling diff_flush calls free(3) on opts.pathspec.items, so it can't be a pointer to a stack variable.
* Bump version to 1.4.0June McEnroe2022-05-15
|
* Tolerate short writes in print_slotHristo Venev2022-05-13
| | | | | | | | | | sendfile() can return after a short read/write, so we may need to call it more than once. As suggested in the manual page, we fall back to read/write if sendfile fails with EINVAL or ENOSYS. On the read/write path, use write_in_full which deals with short writes. Signed-off-by: Hristo Venev <hristo@venev.name>
* git: update to v2.36.1Christian Hesse2022-05-13
| | | | | | Update to git version v2.36.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* git: update to v2.36.0Christian Hesse2022-05-13
| | | | | | | | | | Update to git version v2.36.0, this requires changes for these upstream commits: * 95433eeed9eac439eb21eb30105354b15e71302e diff: add ability to insert additional headers for paths Signed-off-by: Christian Hesse <mail@eworm.de>
* Use release_commit_memory()John Keeping2022-02-18
| | | | | | | | | | | | | | Instead of calling two separate Git functions to free memory associated with a commit object, use Git's wrapper which does this. This also counts as a potential future bug fix since release_commit_memory() also resets the parsed state of the commit, meaning any attempt to use it in the future will correctly fill out the fields again. release_commit_memory() does not set parents to zero, so keep that for additional safety in case CGit checks this without calling parse_commit() again. Signed-off-by: John Keeping <john@keeping.me.uk>
* Reset font size for blame oidJohn Keeping2022-02-18
| | | | | | | | | | | In Firefox, the hashes in the blame UI are out of step with the line number and content leading to ever increasing vertical misalignment. This is caused by the .oid class setting font-size to 90%, so override this back to 100% for the blame case, bringing the height of lines in all three columns of the table back into step. Signed-off-by: John Keeping <john@keeping.me.uk>
* Add a link to the parent commit in blameJohn Keeping2022-02-18
| | | | | | | | | | | | | | When walking through the history, it is useful to quickly see the same file at the previous revision, so add a link to do this. It would be nice to link to the correct line with an additional fragment, but this requires significantly more work so it can be done as an enhancement later. (ent->s_lno is mostly the right thing, but it is the line number in the post-image of the target commit whereas the link is to the parent of that commit, i.e. the pre-image of the target.) Suggested-by: Alejandro Colomar <alx.manpages@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk>
* Fix fmt() off-by-one errorlemon2022-02-18
| | | | | | | | vsnprintf returns the byte count of the formatted output not including the null terminator, so in the case that len == 1024 the last character of the output was being truncated and not detected by the later check. Changing the greater than comparison to greater than or equal fixes this edge case.
* Allow to give readme head from queryChristian Hesse2022-02-17
| | | | | | Reading the README from repository used to be limited to default branch or a branch given in configuration. Let's allow a branch from query if not specified explicitly.
* Bump version to 1.3.0June McEnroe2022-02-13
|
* Update information for forkJune McEnroe2022-02-13
|
* Remove Lua supportJune McEnroe2022-02-13
| | | | | Lua support is unused and the dlsym fwrite/write hacks horrify me. Clean it up.
* Merge remote-tracking branch 'ch/git-2-35'June McEnroe2022-02-13
|\
| * git: update to v2.35.1Christian Hesse2022-01-29
| | | | | | | | | | | | Update to git version v2.35.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.35.0Christian Hesse2022-01-24
| | | | | | | | | | | | Update to git version v2.35.0, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.34.1Christian Hesse2021-11-24
| | | | | | | | | | | | Update to git version v2.34.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.34.0Christian Hesse2021-11-15
| | | | | | | | | | | | | | | | | | | | Update to git version v2.34.0, this requires changes for these upstream commits: * abf897bacd2d36b9dbd07c70b4a2f97a084704ee string-list.[ch]: remove string_list_init() compatibility function Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.33.0Christian Hesse2021-11-03
| | | | | | | | | | | | Update to git version v2.33.0, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
* | Silence owner-info errorJune McEnroe2022-02-13
| | | | | | | | | | cgit runs in a chroot. It is normal that it cannot look up user info in /etc/passwd.
* | Remove default faviconJune McEnroe2022-02-13
| | | | | | | | I do not like these things.
* | Show about path in page titleJune McEnroe2022-02-13
| |
* | Generate valid Atom feedsJune McEnroe2022-02-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes several RFC 4287 violations: > 4.1.1. The "atom:feed" Element > o atom:feed elements MUST contain exactly one atom:id element. > o atom:feed elements SHOULD contain one atom:link element with a rel > attribute value of "self". This is the preferred URI for > retrieving Atom Feed Documents representing this Atom feed. > o atom:feed elements MUST contain exactly one atom:updated element. An atom:id element is generated from cgit_currentfullurl(), and an atom:link element with a rel attribute of "self" is generated with the same URL. An atom:updated element is generated from the date of the first commit in the revision walk. > 4.1.2. The "atom:entry" Element > o atom:entry elements MUST NOT contain more than one atom:content > element. The second atom:content element with the type of "xhtml" is removed. > 4.2.6. The "atom:id" Element > Its content MUST be an IRI, as defined by [RFC3987]. Note that the > definition of "IRI" excludes relative references. Though the IRI > might use a dereferencable scheme, Atom Processors MUST NOT assume it > can be dereferenced. The atom:id elements for commits now use URNs in the "sha1" or "sha256" namespaces. Although these are not registered URN namespaces, they see use in the wild, for instance as part of magnet URIs.
* | Merge up to git v2.32.0June McEnroe2022-02-13
|\|
| * git: update to v2.32.0Christian Hesse2021-06-08
| | | | | | | | | | | | | | | | | | | | Update to git version v2.32.0, this requires changes for these upstream commits: * 47957485b3b731a7860e0554d2bd12c0dce1c75a tree.h API: simplify read_tree_recursive() signature Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.31.1Christian Hesse2021-05-18
| | | | | | | | | | | | Update to git version v2.31.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * md2html: use proper formatting for hrChristian Hesse2021-05-12
| | | | | | | | | | | | | | This addressed a non-existent background image and made the element invisible. Drop the style and use something sane. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.31.0Christian Hesse2021-03-16
| | | | | | | | | | | | | | | | | | | | Update to git version v2.31.0, this requires changes for these upstream commits: * 36a317929b8f0c67d77d54235f2d20751c576cbb refs: switch peel_ref() to peel_iterated_oid() Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.30.1Christian Hesse2021-02-10
| | | | | | | | | | | | Update to git version v2.30.1, no additional changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * tests: t0107: support older and/or non-GNU tarTodd Zullinger2020-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The untar tests for various compression algorithms use shortcut options from GNU tar to handle decompression. These options may not be provided by non-GNU tar nor even by slightly older GNU tar versions which ship on many systems. An example of the latter case is the --zstd option. This was added in GNU tar-1.32 (2019-02-23)¹. This version of tar is not provided by CentOS/RHEL, in particular. In Debian, --zstd has been backported to the tar-1.30 release. Avoid the requirement on any specific implementations or versions of tar by piping decompressed output to tar. This is compatible with older GNU tar releases as well as tar implementations from other vendors. (It may also be a slight benefit that this more closely matches what the snapshot creation code does.) ¹ Technically, the --zstd option was first released in tar-1.31 (2019-01-02), but this release was very short-lived and is no longer listed on the GNU Tar release page. Signed-off-by: Todd Zullinger <tmz@pobox.com> Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| * md2html: use sane_lists extensionJason A. Donenfeld2020-12-29
| | | | | | | | | | | | | | This allows for cleaner nesting semantics and matches github more closely. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
| * git: update to v2.30.0Christian Hesse2020-12-29
| | | | | | | | | | | | | | | | | | | | | | | | | | Update to git version v2.30.0, this requires changes for these upstream commits: * 88894aaeeae92e8cb41143cc2e045f50289dc790 blame: simplify 'setup_scoreboard' interface * 1fbfdf556f2abc708183caca53ae4e2881b46ae2 banned.h: mark non-reentrant gmtime, etc as banned Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.29.2Christian Hesse2020-10-30
| | | | | | | | | | | | | | | | Update to git version v2.29.2. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.29.1Christian Hesse2020-10-27
| | | | | | | | | | | | | | Update to git version v2.29.1. No functional change, but we want latest and greated version number, no? 😜 Signed-off-by: Christian Hesse <mail@eworm.de>
| * tests: try with commit-graphChristian Hesse2020-10-22
| | | | | | | | | | | | | | Git 2.24.0 enabled commit-graph by default and caused crashes without necessary update. Let's test to work with commit-graph. Signed-off-by: Christian Hesse <mail@eworm.de>
| * tests: do not copy snapshots to /tmp/Christian Hesse2020-10-22
| | | | | | | | | | | | | | No idea why this was added... Possibly to inspect the snapshot manually? Let's drop it. Signed-off-by: Christian Hesse <mail@eworm.de>
| * global: replace hard coded hash lengthChristian Hesse2020-10-20
| | | | | | | | | | | | | | With sha1 we had a guaranteed length of 40 hex chars. This changes now that we have to support sha256 with 64 hex chars... Support both. Signed-off-by: Christian Hesse <mail@eworm.de>
| * global: replace references to 'sha1' with 'oid'Christian Hesse2020-10-20
| | | | | | | | | | | | | | | | For some time now sha1 is considered broken and upstream is working to replace it with sha256. Replace all references to 'sha1' with 'oid', just as upstream does. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.29.0Christian Hesse2020-10-19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update to git version v2.29.0, this requires changes for these upstream commits: * dbbcd44fb47347a3fdbee88ea21805b7f4ac0b98 strvec: rename files from argv-array to strvec * 873cd28a8b17ff21908c78c7929a7615f8c94992 argv-array: rename to strvec * d70a9eb611a9d242c1d26847d223b8677609305b strvec: rename struct fields * 6a67c759489e1025665adf78326e9e0d0981bab5 test-lib-functions: restrict test_must_fail usage Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.28.0Christian Hesse2020-07-27
| | | | | | | | | | | | | | | | Update to git version v2.28.0. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
| * git: update to v2.27.0Christian Hesse2020-06-02
| | | | | | | | | | | | | | | | Update to git version v2.27.0. No changes required. Signed-off-by: Christian Hesse <mail@eworm.de>