aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fh/mimetypes'Lars Hjemli2012-03-184-1/+65
|\
| * ui_plain: automatically lookup mimetype when mimetype-file is setFerry Huberts2011-07-194-1/+65
| | | | | | | | | | | | | | | | | | | | | | | | For sites that do not want to configure mime types by hand but still want the correct mime type for 'plain' blobs, configuring a mime type file is made possible. This is handy since such a file is normally already provided (at least on Linux systems). Also, this reflects the gitweb option '$mimetypes_file' Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jp/defbranch'Lars Hjemli2012-03-184-4/+18
|\ \
| * | ui-repolist.c: fallback to "master" if no default branch is specifiedLars Hjemli2011-07-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | When looking for the modtime of a repo we used to rely on repo.defbranch having a value. This is no longer true so this patch provides a default value when needed. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | cgit.c: use resolve_ref() to guess_defbranch()Lars Hjemli2011-06-201-27/+7
| | | | | | | | | | | | | | | | | | | | | | | | The resolve_ref() function handles reading of git- and filesystem symbolic links (including proper whitespace trimming) and packed refs. There's no point in reimplementing this function in cgit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Only guess default branch when a repo page is requestedLars Hjemli2011-06-203-38/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There's no need to invoke guess_defbranch() for each repo during scan-path, since repo.defbranch is only used when repo content is being displayed. Also, some users prefer to register their projects manually in cgitrc but they got no benefit from the new repo.defbranch handling. This patch tries to rectify these issues by only invoking guess_defbranch() when needed, regardless of how the repo was registered. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | guess default branch from HEADJulius Plenz2011-06-202-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a saner alternative than hardcoding the default branch to be "master". The add_repo() function will now check for a symbolic ref in repo_path/HEAD. If there is a suitable one, overwrite repo->defbranch with it. Note that you'll need to strip the newline from the file (-> len-17). If HEAD is a symbolic link pointing directly to a branch below refs/heads/, do a readlink() instead to find the ref name. Signed-off-by: Julius Plenz <plenz@cis.fu-berlin.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'lh/module-links'Lars Hjemli2012-03-188-15/+85
|\ \ \
| * | | Do not provide a default value for `module-link`Lars Hjemli2011-06-152-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old default value was an abomination which never should have been allowed to see the light of day. This patch removes the default, which is a backwards incompatible change with low probability of causing anyone any real trouble (a repo with submodules, displayed by cgit using the default value of `module-link`, is very unlikely to actually generate working links). Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-plain.c: add support for path-selected submodule linksLars Hjemli2011-06-151-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ui-plain.c, the links generated for submodule entry ignored the fact that the entry was in fact a submodule. This patch adds proper submodule links to the plain directory listings. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-tree.c: add support for path-selected submodule linksLars Hjemli2011-06-157-10/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current 'repo.module-link' option is sufficient when all gitlinks in a repository can be converted to commit links in a uniform way, but not when different submodules/paths needs different settings. This patch adds support for 'repo.module-link.<path>', which will be used for linking to submodules at paths matching one such entry. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Lars Hjemli2012-03-183-3/+31
|\ \ \ \
| * | | | filters/syntax-highlighting.sh: work around highlight --force bugFerry Huberts2012-03-181-0/+17
| | | | |
| * | | | filters/highlight.sh: manually support highlight version 2 and 3Ferry Huberts2012-03-181-0/+11
| | | | |
| * | | | tests: properly quote arguments to printfFerry Huberts2012-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2: incorporate remarks of Lukas Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
| * | | | tests: handle paths with whitespaceFerry Huberts2012-03-182-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2: incorporate remarks of Lukas Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
* | | | | css: force text color to black on decorationsFerry Huberts2012-03-181-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | improves readability when embedding into a page that has the text color set to a different color Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
* | | | | css: vertically align the cgit logo imageFerry Huberts2012-03-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When embedding cgit in other pages, the logo alignment needs to be specified to avoid any css rules from the embedding page to make the page look bad. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
* | | | | css: prefix all styles with div#cgitFerry Huberts2012-03-181-169/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to facilitate easier embedding Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl>
* | | | | Merge branch 'stable'Lars Hjemli2012-03-181-1/+1
|\| | | |
| * | | | CGIT-0.9.0.3v0.9.0.3Lars Hjemli2012-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'stable'Lars Hjemli2012-03-182-7/+5
|\| | | |
| * | | | segfault fix on some bogus requestsEric Wong2012-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctx.qry.head can be NULL in some cases due to bad requests by weird bots. I managed to reproduce with: PATH_INFO=/repo.git/shop.php QUERY_STRING=id= Signed-off-by: Eric Wong <normalperson@yhbt.net>
| * | | | use correct type for sizeofJamie Couture2012-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | **L would have worked well too. Depending on the distribution sizeof *L may return 8 instead of 4. **L is preferable, but since we don't expect this datatype to change very often, sizeof int is less subtle and easier to understand. Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
| * | | | ui-ssdiff.c: correct length check for LCS tableEric Wong2012-01-081-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each individual string may be too long for its respective dimension of the LCS table. Signed-off-by: Eric Wong <normalperson@yhbt.net>
* | | | | Merge branch 'stable'Lars Hjemli2012-01-031-1/+1
|\| | | |
| * | | | Fix segmentation fault in empty repositoryJohn Keeping2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a repository is empty, the ATOM feed link is written in the header, but this involves formatting ctx->qry.head which is NULL in this case. With glibc, vsnprintf formats "%s" with a NULL input as "(null)" but on Solaris this results in a segmentation fault. Since we don't have a meaningful head for the atom feed in an empty repository, it's simplest not to write out the link element at all. Signed-off-by: John Keeping <john@metanate.com>
* | | | | Merge branch 'stable'Lars Hjemli2012-01-032-3/+3
|\| | | |
| * | | | Makefile: fetch git tarballs from http://hjemli.net/git/git/Lars Hjemli2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The git tarballs are currently not available from kernel.org, so for now the makefile will download autogenerated tarballs from cgit. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | fix css color value and vertical-align valueNorberto Lopes2012-01-031-2/+2
| | | | |
* | | | | ui-ssdiff.c: set correct diffmode in "control panel"Tim Chen2012-01-031-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When side-by-side-diffs=1 was set in cgitrc, specifying 'ss=0' in the querystring would not set the 'unified' option as active in the dropdown box used to select diffmode.
* | | | | Merge branch 'stable'Lars Hjemli2012-01-039-17/+68
|\| | | |
| * | | | Fix diff mode switching when side-by-side-diffs=1Tim Chen2012-01-033-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When side-by-side-diffs=1 was set in cgitrc, specyfing 'ss=0' in the query- string would not switch to unified diffs. This patch fixes the issue by introducing a separate variable to track the occurrence of "ss" in the querystring.
| * | | | ui-log.c: do not show remote heads if enable-remote-branches=0Georg Müller2012-01-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | If remote branches are not enabled, the branches are still listed in the log view. This patch removes them if enable-remote-branches=0.
| * | | | Add sort parameter to pager of repo listTobias Grimm2012-01-033-13/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the repolist is paged, the page-links are missing the sort parameter, causing the initial page to be custom sorted, but any clicked page will then be with the default sort order again.
| * | | | ui-ssdiff: move LCS table away from the stackJamie Couture2012-01-032-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Printing deferred line changes for files containing long lines would cause a segfault. - limit LCS table size: 128x128. - move LCS table to global context: avoid allocating/freeing memory for every deferred line change. Signed-off-by: Jamie Couture <jamie.couture@gmail.com>
* | | | | shared.c: Only setenv() if value is non-nullLukas Fleischer2012-01-032-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some setenv() implementations (e.g. the one in OpenBSD's stdlib) segfault if we pass a NULL value. Only set environment variables if the corresponding settings are defined to avoid this. Note that this is a minor behaviour change as environment variables were supposed to be set to an empty string if a setting was undefined. Given that this feature isn't part of any official release yet, there's no need to worry about backwards compatibility, really. Change the documentation accordingly. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* | | | | shared.c: Remove unused "linux/limits.h" includeLukas Fleischer2012-01-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This isn't used anywhere and prevents the code from being compiled on other platforms, such as *BSD. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
* | | | | Merge branch 'stable'Lars Hjemli2011-07-222-5/+7
|\| | | |
| * | | | Fix potential XSS vulnerability in rename hintLukas Fleischer2011-07-221-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file name displayed in the rename hint should be escaped to avoid XSS. Note that this vulnerability is only applicable when an attacker has gained push access to the repository. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | Remove dead initialization in cgit_parse_commit()Lukas Fleischer2011-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value stored to "t" during its initialization gets overwritten in any case, so just leave it uninitialized. Spotted by clang-analyzer. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'stable'Lars Hjemli2011-07-212-3/+3
|\| | | |
| * | | | CGIT 0.9.0.2v0.9.0.2Lars Hjemli2011-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | html.c: avoid out-of-bounds access for url_escape_tableEric Wong2011-07-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a segfault for me with with -O2 optimization on x86 with gcc (Debian 4.4.5-8) 4.4.5 I can reliably reproduce it with the following parameters when pointed to the git.git repository: PATH_INFO='/git-core.git/diff/' QUERY_STRING='id=2b93bfac0f5bcabbf60f174f4e7bfa9e318e64d5&id2=d6da71a9d16b8cf27f9d8f90692d3625c849cbc8' Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'stable'Lars Hjemli2011-07-211-0/+1
|\| | | | | |_|_|/ |/| | |
| * | | tests: fix failures when CDPATH is setFerry Huberts2011-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests would otherwise fail because commands such as cd trash/repos/foo && git rev-list --reverse HEAD | head -1 would return 2 lines instead of 1: the 'cd' command also prints the path when CDPATH is set. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Makefile: fix oversight of not using $(DESTDIR) in uninstallFerry Huberts2011-07-191-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | commit-links.sh: improve regular expressionsFerry Huberts2011-07-191-2/+5
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default length for sha1 abbreviations in git is 7. A '#num' at the beginning of the commit message is now recognised, a ':#num' as well, etc.: a '#num' anywhere is now converted to a link. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Lars Hjemli2011-06-181-1/+5
|\| | | |/ |/|
| * cgit.c: improve error message when git repo cannot be accessedLars Hjemli2011-06-181-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | The current 'Not a git repository' error message is not very helpful, since it doesn't state the cause of the problem. This patch uses errno to provide a hint of the underlying problem. It would have been even better to give the exact cause (e.g. for ENOENT it would be nice to know which file/directory is missing), but that would require reimplementing setup_git_directory_gently() which seems a bit overkill. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.