cgit/cgit.c, branch v0.9

Merge branch 'stable'

2011-03-05T13:01:59Z

Avoid trailing slash in virtual-root

2011-03-05T12:50:40Z

When setting virtual-root from cgitrc, care is taken to avoid trailing slashes. But when no virtual-root setting is specified, SCRIPT_FILE from the web server is used without similar checks. This patch fixes the inconsistency, which could lead to double-slashes in generated links. Noticed-by: Wouter Van Hemel Signed-off-by: Lars Hjemli

Merge branch 'br/misc'

2011-02-19T13:51:00Z

* br/misc: Use transparent background for the cgit logo ssdiff: anchors for ssdiff implement repo.logo and repo.logo-link

implement repo.logo and repo.logo-link

2011-02-19T13:41:39Z

Allow for per repo logo and logo-link; Use global logo and logo-link per default. Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Lars Hjemli

Merge branch 'jh/scan-path'

2011-02-19T13:25:55Z

* jh/scan-path: scan_path(): Do not recurse into hidden directories by default scan_path(): Improve handling of inaccessible directories

scan_path(): Do not recurse into hidden directories by default

2011-02-19T13:25:14Z

Paths that start with a period ('.') are considered hidden in the Unix world. scan_path() should arguably not recurse into these directories by default. This patch makes it so, and introduces the "scan-hidden-path" config variable for overriding the new default and revert to the old behaviour (scanning _all_ directories, including hidden .directories). Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Implement support for commit graphs

2010-11-16T07:18:36Z

Teach CGit to print an ASCII art commit graph to the left of the commit message, similar to 'git log --graph'. The graph adds extra lines (table rows) to the log when needed to add/remove/shuffle edges in the graph. When 'showmsg' is enabled, the graph is automatically padded to account for the extra lines added by the commit message/notes. This feature is controlled by a new config variable: "enable-commit-graph" (disabled by default), and individual repos can control it by setting "repo.enable-commit-graph". Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

Add `strict-export` option

2010-11-08T18:41:13Z

This option is used to specify a filename which needs to be present in the repositories found during `scan-path` processing. By setting this option to 'git-daemon-export-ok', only repositories explicitly marked for git daemon export will be included in the cgit configuration. Signed-off-by: Felix Hanley Signed-off-by: Lars Hjemli

Use GIT-1.7.3

2010-09-27T05:58:13Z

This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542. Noticed-by: Silvio Cesare Signed-off-by: Lars Hjemli

Merge branch 'ml/bugfix'

2010-09-19T17:00:05Z