aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge branch 'stable'Lars Hjemli2012-01-039-17/+68
|\| | | |
| * | | | Fix diff mode switching when side-by-side-diffs=1•••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. Tim Chen2012-01-033-2/+3
| * | | | ui-log.c: do not show remote heads if enable-remote-branches=0•••If remote branches are not enabled, the branches are still listed in the log view. This patch removes them if enable-remote-branches=0. Georg Müller2012-01-031-0/+3
| * | | | Add sort parameter to pager of repo list•••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. Tobias Grimm2012-01-033-13/+19
| * | | | ui-ssdiff: move LCS table away from the stack•••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> Jamie Couture2012-01-032-2/+43
* | | | | shared.c: Only setenv() if value is non-null•••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> Lukas Fleischer2012-01-032-2/+2
* | | | | shared.c: Remove unused "linux/limits.h" include•••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> Lukas Fleischer2012-01-031-1/+0
* | | | | Merge branch 'stable'Lars Hjemli2011-07-222-5/+7
|\| | | |
| * | | | Fix potential XSS vulnerability in rename hint•••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> Lukas Fleischer2011-07-221-4/+6
| * | | | Remove dead initialization in cgit_parse_commit()•••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> Lukas Fleischer2011-07-221-1/+1
* | | | | Merge branch 'stable'Lars Hjemli2011-07-212-3/+3
|\| | | |
| * | | | CGIT 0.9.0.2•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-07-211-1/+1
| * | | | html.c: avoid out-of-bounds access for url_escape_table•••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> Eric Wong2011-07-211-2/+2
* | | | | Merge branch 'stable'Lars Hjemli2011-07-211-0/+1
|\| | | | | |_|_|/ |/| | |
| * | | tests: fix failures when CDPATH is set•••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> Ferry Huberts2011-07-211-0/+1
* | | | Makefile: fix oversight of not using $(DESTDIR) in uninstall•••Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Ferry Huberts2011-07-191-3/+3
* | | | commit-links.sh: improve regular expressions•••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> Ferry Huberts2011-07-191-2/+5
| |_|/ |/| |
* | | Merge branch 'stable'Lars Hjemli2011-06-181-1/+5
|\| | | |/ |/|
| * cgit.c: improve error message when git repo cannot be accessed•••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> Lars Hjemli2011-06-181-1/+5
* | Merge branch 'stable'Lars Hjemli2011-06-151-0/+6
|\|
| * cgitrc.5.txt: document repo.module-link•••The global module-link option can be overridden per repo, but this has never been documented. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-151-0/+6
* | Merge branch 'lh/clone-url'Lars Hjemli2011-06-1311-16/+40
|\ \
| * | cgit.c: add 'clone-url' setting with support for macro expansion•••The current 'clone-prefix' setting has some known issues: * All repos get the same 'clone-prefix' value since the setting is not adopted during repo registration (in cgitrc, or during scan-path traversal), but only when the setting is used. * The generated clone-urls for a repo is a combination of 'clone-prefix', a slash and the repo url. This doesn't work well with e.g. ssh-style urls like 'git@example.org:repo.git', since the inserted slash will make the repo relative to the filesystem root. * If 'remove-suffix' is enabled, the generated clone-urls will not work for cloning (except for http-urls to cgit itself) since they miss the '.git' suffix. The new 'clone-url' setting is designed to avoid the mentioned issues: * Each repo adopts the default 'clone-url' when the repo is defined. This allows different groups of repos to adopt different values. * The clone-urls for a repo is generated by expanding environment variables in a string template without inserting arbitrary characters, hence any kind of clone-url can be generated. * Macro expansion also eases the 'remove-suffix' pain since it's now possible to define e.g. 'clone-url=git://foo.org/$CGIT_REPO_URL.git' for a set of repos. A furter improvement would be to define e.g. $CGIT_REPO_SUFFIX to '.git' for all repos which had their url prettified, or to store the original $CGIT_REPO_URL in e.g. $CGIT_REPO_REAL_URL before suffix removal. Reviewed-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-137-4/+26
| * | cgit.c: always setup cgit repo environment variables•••When cgit learned to setup environment variables for certain repo settings before invoking a filter process, the setup occurred inside cgit_open_filter(). This patch moves the setup out of cgit_open_filter() and into prepare_repo_cmd() to prepare for additional uses of these variables. Reviewed-by: Ferry Huberts <mailings@hupie.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-138-12/+14
|/ /
* | cgitrc.5.txt: reformat the "FILTER API" section•••This patch makes the generated man-page for the filer api section more similar to the other sections. Also, the bulleted list of environment variables wasn't rendered correctly (with asciidoc 8.5.2), without an empty line before the first item. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-131-26/+24
* | Merge branch 'stable'•••Conflicts: cgitrc.5.txt Lars Hjemli2011-06-131-4/+26
|\|
| * cgitrc.5.txt: describe macro expansion of cgitrc options•••This is a new feature in cgit-0.9 which was formerly undocumented. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-131-4/+26
* | Merge branch 'stable'Lars Hjemli2011-06-131-16/+6
|\|
| * README: update some stale information/add some new•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-131-16/+6
* | Merge branch 'stable'Lars Hjemli2011-06-131-1/+1
|\|
| * CGIT 0.9.0.1•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-131-1/+1
* | Merge branch 'stable'Lars Hjemli2011-06-121-19/+46
|\|
| * ui-plain.c: fix html and links generated by print_dir() and print_dir_entry()•••This patch fixes the following issues: * the base argument usually isn't zero-terminated, so printing base without considering baselen will usually generate random garbage * when the current url represents a directory but doesn't end in a slash, relative urls would be incorrect * using unescaped paths allows XSS Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-121-19/+46
* | Merge branch 'stable'Lars Hjemli2011-06-061-0/+2
|\|
| * scan-tree.c: avoid memory leak•••No references are kept to the memory pointed to by the 'rel' variable, so it should be free()'d before returning from add_repo(). Signed-off-by: Jamie Couture <jamie.couture@gmail.com> Signed-off-by: Lars Hjemli <larsh@hjemli.net> Jamie Couture2011-06-061-0/+2
* | Merge branch 'stable'Lars Hjemli2011-06-023-12/+1
|\|
| * ui-log.c: do not link from age column•••The link url wasn't properly escaped, and since the link was identical to the one used on the commit message it didn't serve any special purpose. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-022-10/+1
| * ui-snapshot.c: remove debug cruft•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-06-021-2/+0
* | ui-stats.c: fix invalid html•••Found by http://validator.w3.org. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-05-301-1/+1
* | Merge branch 'stable'Lars Hjemli2011-05-301-1/+3
|\|
| * Properly escape ampersands inside HTML attributes•••Ampersands ("&") appearing inside HTML attributes need to be translated to "&amp;". Otherwise, invalid XHTML will be generated at various places, such as at tree views containing links to submodules. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lukas Fleischer2011-05-301-1/+3
* | ui_repolist: get modtime from packed-refs as fallback•••When no modtime could be determined then as a final fallback try to get it from the packed-refs. This will show an idle time when a repository has been packed with all refs in the packed-refs. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Ferry Huberts2011-05-301-3/+12
* | Merge branch 'lh/panel'Lars Hjemli2011-05-238-62/+124
|\ \
| * | ui-stats.c: create a control panel for stat options•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-03-071-24/+27
| * | ui-diff.c: create a control panel for diff options•••Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-03-065-38/+88
| * | html.c: add html_intoption()•••This is similar to html_option, but for int values. Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-03-062-0/+9
* | | Merge branch 'fh/filter-api'•••Conflicts: cgit.c Lars Hjemli2011-05-2311-21/+127
|\ \ \
| * | | shared.c: use execvp() to execute filter commands•••This reintroduces the use of execvp(), since the filter commands doesn't always contain an absolute path (i.e. snapshot compression filters). Signed-off-by: Lars Hjemli <hjemli@gmail.com> Lars Hjemli2011-03-261-56/+10
| * | | filters: document environment variables in filter scripts•••Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Ferry Huberts2011-03-263-5/+64
| * | | cgit_open_filter: hand down repo configuration to script•••The environment variables can be used to (for example) resolve the following situation: Suppose a server setup in which each repository has a trac instance; the commit filter needs to know with which repository it's dealing in order to be able to resolve the #123 ticket numbers in the commit messages into hyperlinks into the correct trac instance. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Lars Hjemli <hjemli@gmail.com> Ferry Huberts2011-03-261-1/+77