diff options
author | Lars Hjemli <hjemli@gmail.com> | 2011-06-06 20:49:13 +0000 |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2011-06-13 23:04:30 +0000 |
commit | a1429dbc89f9c0945e32cea9fd3424d2fe56aeab (patch) | |
tree | 78d1501781d72f0698f673e9c44450e32118d843 /shared.c | |
parent | cgit.c: always setup cgit repo environment variables (diff) | |
download | cgit-pink-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.tar.gz cgit-pink-a1429dbc89f9c0945e32cea9fd3424d2fe56aeab.zip |
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>
Diffstat (limited to '')
-rw-r--r-- | shared.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/shared.c b/shared.c index 4adeaa8..699c362 100644 --- a/shared.c +++ b/shared.c @@ -70,6 +70,7 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->about_filter = ctx.cfg.about_filter; ret->commit_filter = ctx.cfg.commit_filter; ret->source_filter = ctx.cfg.source_filter; + ret->clone_url = ctx.cfg.clone_url; return ret; } |