cgit/shared.c, branch lh/grep

Merge branch 'jp/defbranch'

2012-03-18T21:00:18Z

Merge branch 'lh/module-links'

2012-03-18T20:59:36Z

shared.c: Only setenv() if value is non-null

2012-01-03T14:59:36Z

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

shared.c: Remove unused "linux/limits.h" include

2012-01-03T14:53:41Z

This isn't used anywhere and prevents the code from being compiled on other platforms, such as *BSD. Signed-off-by: Lukas Fleischer

Only guess default branch when a repo page is requested

2011-06-20T18:59:10Z

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

ui-tree.c: add support for path-selected submodule links

2011-06-15T08:40:13Z

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.', which will be used for linking to submodules at paths matching one such entry. Signed-off-by: Lars Hjemli

cgit.c: add 'clone-url' setting with support for macro expansion

2011-06-13T23:04:30Z

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 Signed-off-by: Lars Hjemli

cgit.c: always setup cgit repo environment variables

2011-06-13T23:03:46Z

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 Signed-off-by: Lars Hjemli

Merge branch 'fh/filter-api'

2011-05-23T21:28:38Z

Conflicts: cgit.c

Remove unused variable from cgit_diff_tree().

2011-05-23T20:58:35Z

Seen with "-Wunused-but-set-variable". Signed-off-by: Lukas Fleischer Signed-off-by: Lars Hjemli