aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2015-03-09Avoid non-ANSI function declarationsJohn Keeping9-25/+25
Sparse says things like: warning: non-ANSI function declaration of function 'calc_ttl' Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-09Makefile: add a target to run CGit through sparseJohn Keeping2-1/+11
Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-07git: update to v2.3.2Christian Hesse2-1/+1
Update to git version v2.3.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-03-05Bump versionv0.11.1Jason A. Donenfeld1-1/+1
2015-03-05Drop return value from parse_user()Lukas Fleischer1-11/+7
In commit 936295c (Simplify commit and tag parsing, 2015-03-03), the commit and tag parsing code was refactored. This broke tag messages in ui-tag since the line after the tagger header was erroneously skipped. Rework parse_user() and skip the line manually outside parse_user(). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-03-05Remove leading newline characters from tag messagesLukas Fleischer1-0/+3
Fixes a regression introduced in commit 936295c (Simplify commit and tag parsing, 2015-03-03). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-03-05simple-authentication.lua: tie secure cookies to field namesJason A. Donenfeld1-13/+21
2015-03-05cgit: show clone URLs for empty repoJason A. Donenfeld2-1/+17
2015-03-03cache: use F_SETLK to avoid stale lock filesJohn Keeping1-1/+14
If CGit is killed while it holds a lock on a cache slot (for example because it is taking too long to generate a page), the lock file will be left in place. This prevents any future attempt to use the same slot since it will fail to exclusively create the lock file. Since CGit is the only program that should be manipulating lock files, we can use advisory locking to detect whether another process is actually using the lock file or if it is now stale. I have confirmed that this works on Linux by setting a short TTL in a custom cgitrc and running the following with CGit patched to print a message to stderr if the fcntl(2) fails: $ export CGIT_CONFIG=$PWD/cgitrc $ export QUERY_STRING=url=cgit/tree/ui-shared.c $ ./cgit | grep -v -e '^<div class=.footer.>' \ -e '^Last-Modified: ' \ -e ^'Expires: ' >expect $ seq 50000 | dd bs=8192 | parallel -j200 "diff -u expect <(./cgit | grep -v -e '^<div class=.footer.>' \ -e '^Last-Modified: ' \ -e ^'Expires: ') || echo BAD" This printed the fail message several times without ever printing "BAD". Signed-off-by: John Keeping <john@keeping.me.uk>
2015-03-03Make root handling sane again.Jason A. Donenfeld3-14/+14
2015-03-03ui-shared: Add current url helper function.Jason A. Donenfeld3-4/+12
2015-03-03ui-shared: keep filter repolist page in paginationJason A. Donenfeld1-3/+3
2015-03-03ui-repolist: use ctx.qry.url instead of rooturl, in case we're filteringJason A. Donenfeld2-3/+3
2015-03-03ui-repolist: use correct owner query linkJason A. Donenfeld1-1/+1
2015-03-03Simplify commit and tag parsingLukas Fleischer1-72/+42
* Use skip_prefix to avoid magic numbers in the code. * Use xcalloc() instead of xmalloc(), followed by manual initialization. * Split out line splitting. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-03-03git: update to v2.3.1Christian Hesse2-1/+1
Update to git version v2.3.1, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-02-15Bump verisonv0.11.0Jason A. Donenfeld1-1/+1
2015-02-15shrink cgit.png file sizeChristian Hesse1-0/+0
Ran optipng against cgit.png, which shrank file size by more than eight percent. The image (including protocol overhead) should fit into a single network packet now. Optipng optimizes filters and compression. The actual pixel results are not altered. Signed-off-by: Christian Hesse <mail@eworm.de>
2015-02-09ui-clone.c: Fix off-by-one error in pack pathJason A. Donenfeld1-5/+11
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
2015-02-09ui-clone.c: Fix path checkLukas Fleischer1-2/+2
The starts_with() check was broken in two ways: For one thing, the parameters were passed in the wrong order, for another thing, starts_with() returns 1 if the string starts with the prefix (not 0). Note that this bug existed since commit 02a545e (Add support for cloning over http, 2008-08-06) but only pops in in corner cases. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-02-08git: update for v2.3.0Christian Hesse6-23/+19
* sort_string_list(): rename to string_list_sort() (upstream commit 3383e199) * update read_tree_recursive callback to pass strbuf as base (upstream commit 6a0b0b6d) Signed-off-by: Christian Hesse <mail@eworm.de>
2015-02-05ui-shared.c: Refactor add_clone_urls()Lukas Fleischer1-22/+10
Make use of strbuf_split_str() and strbuf lists to split clone URLs. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-01-29Add repo.hide and repo.ignoreLukas Fleischer5-0/+23
These options can be used to hide a repository from the index or completely ignore a repository, respectively. They are particularly useful when used in combination with scan-path. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-01-28Add Etags for snapshotsJanus1-0/+1
2015-01-19tag: reference with "h" instead of "id"masterJohn Keeping4-9/+8
When clicking on "log" from a tag we end up showing the log of whatever branch we used to reach the tag. If the tag doesn't point onto a branch then the tagged commit won't appear in this output. By linking to tags with the head parameter instead of the "id" parameter the log link will show the log of the tag. This is clearly desirable when the tag has been reached from the refs UI and changing the behaviour for tag decorations makes them match branch decorations where log -> decoration -> log shows the log of the decoration. Reported-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: John Keeping <john@keeping.me.uk>
2015-01-15Return proper HTTP response when accessing info/Lukas Fleischer1-1/+3
Currently, when a user directly accesses the info command of a repository, we exit cgit without printing anything to stdout, bringing up error messages like "502 Bad Gateway" or "An error occurred while reading CGI reply (no response received)". Instead of bailing out, at least print the HTTP headers, including a reasonable error message. Reported-by: Janus Troelsen Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2015-01-13git: update to v2.2.2Christian Hesse2-1/+1
Update to git version v2.2.2, no changes required. Signed-off-by: Christian Hesse <mail@eworm.de>
2014-12-30ui-diff: don't link to single file diff statJohn Keeping1-0/+10
Seeing the diff stat for a single file is pretty useless, so reset the diff type before generating the links to individual files in the diff stat so that the links will show a useful diff. Reported-by: Konstantin Ryabitsev <mricon@kernel.org> Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-28ui-patch: match git-format-patch(1) outputJohn Keeping2-3/+4
Using (DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_PATCH) causes Git to emit a "---" line between the commit message and the body of the patch, which fixes a regression introduced in commit 455b598 (ui-patch.c: Use log_tree_commit() to generate diffs, 2013-08-20), prior to which we inserted the "---" line ourselves. DIFF_FORMAT_SUMMARY is added so that we match the output of git-format-patch(1) without the "-p" option. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-28t0108: modernize styleJohn Keeping1-10/+10
* &&-chaining * use test_cmp instead of cmp * use strip_headers instead of knowing how many lines there will be Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-24Revert "git: use xz compressed archive for download"Jason A. Donenfeld1-2/+2
This reverts commit a87c9d8a9779eab0499efd3c44e090a28c7d1cdf. We want to make OpenBSD people happy.
2014-12-24Use split_ident_line() in parse_user()Lukas Fleischer1-28/+17
Use Git's built-in ident line splitting algorithm instead of reimplementing it. This does not only simplify the code but also makes sure that cgit is consistent with Git when it comes to author parsing. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2014-12-24footer: link back to cgit home pageJason A. Donenfeld2-1/+8
The footer has always been overrideable using the footer= in cgitrc, so this won't anger anybody who cares about their footer.
2014-12-24ui-shared: show absolute time in tooltip for relative datesJohn Keeping1-12/+23
Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-24git: use xz compressed archive for downloadChristian Hesse1-2/+2
2014-12-24match other common markdown file extensionsChris Burroughs1-1/+1
2014-12-24repolist: add owner-filterChris Burroughs7-8/+64
This allows custom links to be used for repository owners by configuring a filter to be applied in the "Owner" column in the repository list.
2014-12-24ui-shared: add rel-vcs microformat links to HTML headerJohn Keeping1-0/+11
As described at https://joeyh.name/rfc/rel-vcs/. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-24ui-summary: add "rel='vcs-git'" to clone URL linksJohn Keeping1-2/+4
This is described in the rel-vcs microformat[1]. [1] https://joeyh.name/rfc/rel-vcs/ Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-24Extract clone URL printing to ui-shared.cJohn Keeping3-46/+51
This will allow us to reuse the same logic to add clone URL <link/> elements to the header of all repo-specific pages in order to support the rel-vcs microformat. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-24Remove trailing slash after remove-suffixLukas Fleischer1-3/+6
When removing the ".git" suffix of a non-bare repository, also remove the trailing slash for compatibility with cgit_repobasename(). Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2014-12-24git: update to v2.2.1Christian Hesse5-7/+8
Update to git version v2.2.1, including API changes. Signed-off-by: Christian Hesse <mail@eworm.de>
2014-12-13filter: fix libravatar email-filter https issueChristian Hesse1-1/+2
Serving cgit via https and getting avatar via http gives error messages about untrusted content. This decides whether or not to use https link by looking at the environment variable HTTPS, which is set in CGI.
2014-12-13ui-diff: add "stat only" diff typeJohn Keeping2-1/+5
This prints the diffstat but stops before printing (or generating) any of the body of the diff. No cgitrc option is added here so that we can wait to see how useful this is before letting people set it as the default. Suggested-by: Konstantin Ryabitsev <mricon@kernel.org> Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-13Change "ss" diff flag to an enumJohn Keeping4-14/+24
This will allow us to introduce a new "stat only" diff mode without needing an explosion of mutually incompatible flags. The old "ss" query parameter is still accepted in order to avoid breaking saved links, but we no longer generate any URIs using it; instead the new "dt" (diff type) parameter is used. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping4-8/+8
This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping5-13/+11
This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-08-07git: update to v2.0.4John Keeping2-1/+1
No CGit changes required. Signed-off-by: John Keeping <john@keeping.me.uk>
2014-08-07Always check if README exists in choose_readme()Lukas Fleischer1-6/+0
Specifying a nonexistent README file via the readme option is sometimes useful, e.g. when using scan-path and setting a global default. Currently, we check whether there is only one option in the readme option and, if so, we choose that file without checking whether it exists. As a consequence, all repositories are equipped with an about link in the aforementioned scenario, even if there is no about file. Remove the early check for the number of keys and always check whether the file exists instead. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
2014-08-01cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld1-1/+1