| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542.
Noticed-by: Silvio Cesare <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
* br/misc:
Use transparent background for the cgit logo
ssdiff: anchors for ssdiff
implement repo.logo and repo.logo-link
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Allow for per repo logo and logo-link; Use global logo and logo-link per
default.
Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* jh/scan-path:
scan_path(): Do not recurse into hidden directories by default
scan_path(): Improve handling of inaccessible directories
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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 <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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 <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were many places where the arguments to a printf-like function did
not match the format string. Mostly, these were a missing 'l' flag, but
there were three exceptions:
- In ui-stats.c, a size_t argument must be printed. C99 has the "%zu"
flag for this purpose, but not all compilers support this. Therefore,
we mimic what git does - use a NO_C99_FORMAT Makefile variable.
- In ui-stats.c, cgit_print_error() was called with a pointer instead of
a character.
- In ui-log.c, the "columns" argument was never used.
Signed-off-by: Mark Lodato <[email protected]>
|
|\ \ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
scan-tree.c
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
This option can be used to autogenerate section names during scan-path
processing.
Signed-off-by: Lars Hjemli <[email protected]>
|
|/ /
| |
| |
| |
| |
| | |
The value of this option is used as the default value for repo.readme.
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| | |
Signed-off-by: Jason A. Donenfeld <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When this option is enabled (which it is by default), cgit will lookup
the 'gitweb.owner' setting in each git config file found when processing
the 'scan-path' option.
Signed-off-by: Jason A. Donenfeld <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| | |
When this option is enabled, the '.git' suffix of repository directories
found while processing the 'scan-path' option will be removed.
Signed-off-by: Jason A. Donenfeld <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This option specifies the location of a projectlist file as used by
gitweb - when 'scan-tree' is later specified, only the projects listed in
the projectlist file will be added.
Signed-off-by: Jason A. Donenfeld <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The new ctx.qry.ignorews variable is passed via cgit_diff_files() and
cgit_diff_tree() to Git's diff machinery. This is equivalent to passing
--ignore-all-space to 'git diff'.
Signed-off-by: Johan Herland <[email protected]>
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This patch teaches cgit to expand environment variables in certain
cgitrc option values (cache_root, scan-path, include) plus when
finding the location of cgitrc itself.
One use case for this feature is virtual hosting - e.g. by setting
$CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual
hosts automatically gets their own cgitrc.
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
Conflicts:
cgit.c
cgit.h
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The new ctx.qry.context variable is picked up by cgit_print_diff(), and
passed via cgit_diff_files() to Git's diff machinery.
Signed-off-by: Johan Herland <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
cgit.h
ui-commit.c
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
For many commands/pages (e.g. 'tree', 'diff', 'plain', etc.), the
ctx.qry.path argument is interpreted as a path within the "virtual" project
directory structure. However, for some other commands (notably 'refs', and
the clone-related commands) ctx.qry.path is used in a different context (as
a more or less "real" path within the '.git' directory).
This patch differentiates between these two usages of ctx.qry.path, by
introducing a new variable - ctx.qry.vpath - which is equal to ctx.qry.path
in the former case, and NULL in the latter.
This will become useful in future patches when we want various pages and the
links between them to preserve existing in-project paths.
Signed-off-by: Johan Herland <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This allows one to specify the items in the RSS feeds
Signed-off-by: Aaron Griffin <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | | |
Displays all items from all branches in one feed
Signed-off-by: Aaron Griffin <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|/ /
| |
| |
| |
| |
| |
| | |
The new option 'enable-subject-links' must be used to enable the verbose
parent-links in commit view.
Signed-off-by: Lars Hjemli <[email protected]>
|
|\| |
|
| |
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ |
|
| | |
| | |
| | |
| | | |
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
A new config option side-by-side-diffs added, defaulting to 0,
meaning unidiff. Also a query option (ss) is used toggle this.
In the commit page you can switch between the two diff formats by
clicking on the link on the "commit"-row, to the right of (patch).
In the diff page you can switch by using the link at the start
of the page.
All commit-links and diff-links will remember the choice.
Signed-off-by: Ragnar Ouchterlony <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ \ \ \ |
|
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Sometimes it is not feasible to generate the HTML pretty-print for large
files, especially if a source-filter is involved or binary data is to be
displayed. The "max-blob-size" config var allows to disable HTML output
for blobs bigger than X KBytes. Plain downloads are not affected.
Signed-off-by: Georg Lukas <[email protected]>
|
|\ \ \ \
| |/ / /
|/| | /
| | |/
| |/| |
|
| |/
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|
|/
|
|
|
|
|
|
| |
Makes it easier to rewrite :)
lighttpd-sandbox: rewrite "/cgit.cgi?url=%{enc:request.path}&%{request.query}";
Signed-off-by: Stefan Bühler <[email protected]>
Signed-off-by: Lars Hjemli <[email protected]>
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The repo-specific 'snapshots' option is bitwise AND'ed with the global
'snapshots' option during parsing, and since the global cgitrc hasn't
been parsed when --scan-path is processed the global 'snapshots' will
always be 0 (i.e. no repo-specific 'snapshots' setting will have any
effect).
This patch fixes the issue by setting the global 'snapshots' mask to
0xFF (hence relying on later parsing of the generated cgitrc repolist
to do the right thing).
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Since repo.desc might have been populated by reading the 'description'
file in GIT_DIR, it may contain newlines. And by printing the literal
value, we may then generate an invalid cgitrc include-file.
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| |
| | |
Note: print_repo() still ignores repo.max-stats and repo.snapshots,
which both requires additional work since these settings are represented
internally as an enum and a bitmap.
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| |
| |
| |
| | |
This option must be enabled if repo-specific cgitrc files should be
allowed to override any of the 'filter' options.
Signed-off-by: Lars Hjemli <[email protected]>
|
| |
| |
| |
| | |
Signed-off-by: Lars Hjemli <[email protected]>
|