AgeCommit message (Collapse)AuthorLines
CGIT 0.8.2.1v0.8.2.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-snapshot: avoid segfault when no filename is specifiedLars Hjemli-6/+17
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
fix segfault when displaying empty blobsEric Wong-5/+8
When size is zero, subtracting one from it turns it into ULONG_MAX which causes an out-of-bounds access on buf. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-tree: escape ascii-text properly in hexdump viewLars Hjemli-4/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
CGIT 0.8.2v0.8.2Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Use GIT-1.6.1.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/binary'Lars Hjemli-30/+119
shared.c: avoid SEGFAULT when checking for binary buffersLars Hjemli-2/+2
Before calling buffer_is_binary() we need to verify that the buffer is valid. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/header'Lars Hjemli-0/+9
ui-tree: show hexdump of binary blobsLars Hjemli-23/+67
This teaches ui-tree to detect binary blobs and display them similar to `hexdump -C` (only wider). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Handle binary files in diffsLars Hjemli-7/+52
This teaches all diff-related operations (i.e. ui-log, ui-diff and ui-patch) how to handle binary files. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+4
html.c: use correct escaping in html attributesLars Hjemli-2/+4
First, an apostrophe is not a quote. Second, we also need to escape quotes. And finally, quotes are encoded as '&quot;', not '&quote;'. Sighned-off-by: Lars Hjemli <hjemli@gmail.com>
Add support for a custom headerLars Hjemli-0/+9
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-1/+1
Merge branch 'jw/commit-decorations'Lars Hjemli-1/+12
Conflicts: cgit.css Signed-off-by: Lars Hjemli <hjemli@gmail.com>
tests/t0105-commit.sh: expect commit decorationsLars Hjemli-1/+1
When a commit is referenced by a branch or tag the commit subject- line will be suffixed with the proper decorations, hence the test for this line needs to be updated. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
cgit.css: minor adjustment of commit decorationsLars Hjemli-0/+5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Add decorations to commit pagesJustin Waters-0/+5
This adds the tag and branch head decorations to the commit pages. This is similar to how commits are displayed in the standard gitweb interface. Signed-off-by: Justin Waters <justin.waters@timesys.com>
CGIT 0.8.1.1v0.8.1.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'og/tree-view-selection'Lars Hjemli-28/+34
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'lh/stats'Lars Hjemli-4/+569
Conflicts: cgit.c cgit.css cgit.h ui-tree.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-8/+11
Makefile: install cgit.{css,png} in CGIT_DATA_PATHTodd Zullinger-4/+6
CGIT_DATA_PATH defaults to CGIT_SCRIPT_PATH, but allows users to install the cgi and the data files in different locations. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Makefile: add INSTALL var to set install commandTodd Zullinger-4/+5
This also explicitly sets the modes for installed files (755 for the .cgi, 644 for the .css and .png). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Fix tar.bz2 snapshot exampleTodd Zullinger-2/+2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+6
Avoid SEGFAULT on invalid requestsLars Hjemli-2/+6
When an unknown page is requested, either on the querystring or via PATH_INFO, we end up with a null-referencing cgit_cmd. This null- pointer is then used as argument to the hc() function (which decides what tab to render as 'active'), but this function failed to check if a valid cmd was specified and a SEGFAULT would occur. This patch fixes the issue by introducing a 'fallback-cmd' which specifies what tab to render as 'active' when no valid cmd is requested. While at it, we now also keep track of the active repository even if an invalid cmd was requested since we want to show the error message about the invalid request in the correct context. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Make all tags viewableRobin Redeker-2/+11
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+3
ui-tag: escape tagnames properlyLars Hjemli-2/+3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Change toggle to more meaningful termJustin Waters-1/+2
In the log interface, there is a toggle link at the top, but it isn't clear what's being toggled. I've changed it to "Expand" and "Collapse" to make it clear that you are getting more and less information, respectively. Signed-off-by: Justin Waters <justin.waters@timesys.com>
Merge branch 'snapshot-fixes'Lars Hjemli-13/+15
Merge branch 'lh/mimetypes'Lars Hjemli-3/+3
Merge branch 'lh/virtual-root'Lars Hjemli-20/+21
Merge branch 'stable'Lars Hjemli-2/+2
ui-log: show name-decorations in log outputLars Hjemli-0/+59
Commits are now decorated with a clickable 'label' for each ref pointing at it, similar to how gitweb and gitk displays commit decorations. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Makefile: avoid libcurl when building gitLars Hjemli-2/+2
We don't need support for fetching/pushing in libgit.a, hence we don't need to link with libcurl. Noticed-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-refs: avoid SEGFAULT on lightweight tagsRobin Redeker-1/+1
Signed-off-by: Robin Redeker <elmex@ta-sa.org> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
changed objects are outputted, allowing for selections of code onlyOnne Gorter-28/+34
Merge branch 'stable'Lars Hjemli-3/+5
ui-tree.c: do not add blank line when displaying blobsLars Hjemli-3/+5
Also, fix a related bug in the test-suite. Noticed-by: Jim Meyering <jim@meyering.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Merge branch 'stable'Lars Hjemli-2/+2
ui-patch: whitespace changes in the patch generation codeTomas Carnecky-2/+2
Add a space between the committer name and email, and remove superfluous spaces in the date header. This makes cgit-generated patches match the output from git-format-patch almost exactly, at least as far as the email headers go. Signed-off-by: Tomas Carnecky <tom@dbservice.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
tests/t0107-snapshot.sh: make testscript match updated snapshot behaviorLars Hjemli-10/+10
Since cgit now returns a 404 error when the snapshot filename cannot be resolved to a commit object, the testscript needs to request a valid snapshot name. Also, the script assumed that the toplevel directory in the snapshot would get the name of the repository but it's now named similar to the requested snapshot. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
return 404 if snapshot is not foundNatanael Copa-3/+5
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
ui-snapshot.c: change mime-type for tar.gz and tar.bz2Lars Hjemli-3/+3
The updated mime-types seems to work better than the old ones with both safari and firefox. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Use GIT-1.6.1Lars Hjemli-1/+1
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
shared.c: future-proof usage of git diff-structuresLars Hjemli-1/+3
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Untie logic for SCRIPT_NAME and PATH_INFOLars Hjemli-20/+21
SCRIPT_NAME is used as fallback for virtual-root when virtual-root is unspecified in cgitrc and PATH_INFO is used as fallback for the query- string parameter 'url' when the latter is unspecified. But until now, the use of PATH_INFO depended on virtual-root also being unspecified, i.e. it was impossible to use PATH_INFO when virtual-root was specified. This commit makes the fallback on SCRIPT_NAME and PATH_INFO independent code paths, i.e. it is now possible to specify virtual-root in cgitrc while still using PATH_INFO (instead of rewrite rules) to get 'pretty urls'. Noticed-by: Jack Moffitt <jack@chesspark.com> Noticed-by: LiKai Liu <liulk@cs.bu.edu> Signed-off-by: Lars Hjemli <hjemli@gmail.com>