diff options
Diffstat (limited to '')
-rw-r--r-- | Makefile | 4 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | shared.c | 2 | ||||
-rw-r--r-- | ui-snapshot.c | 7 |
4 files changed, 7 insertions, 6 deletions
diff --git a/Makefile b/Makefile index eed59df..e39be18 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ -CGIT_VERSION = v0.7.1 +CGIT_VERSION = v0.7.2 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> -GIT_VER = 1.5.3.5 +GIT_VER = 1.5.3.8 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # diff --git a/git b/git -Subproject 3f2a7ae2c84c921e11041a5edc2522964fc1cce +Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c diff --git a/shared.c b/shared.c index 9c992c8..bf0581f 100644 --- a/shared.c +++ b/shared.c @@ -118,7 +118,7 @@ struct repoinfo *add_repo(const char *url) ret->url = trim_end(url, '/'); ret->name = ret->url; ret->path = NULL; - ret->desc = NULL; + ret->desc = "[no description]"; ret->owner = NULL; ret->group = cgit_repo_group; ret->defbranch = "master"; diff --git a/ui-snapshot.c b/ui-snapshot.c index 4d1aa88..dfedd8f 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -130,7 +130,7 @@ int cgit_parse_snapshots_mask(const char *str) { const struct snapshot_archive_t* sat; static const char *delim = " \t,:/|;"; - int f, tl, rv = 0; + int f, tl, sl, rv = 0; /* favor legacy setting */ if(atoi(str)) @@ -142,8 +142,9 @@ int cgit_parse_snapshots_mask(const char *str) break; for(f=0; f<snapshot_archives_len; f++) { sat = &snapshot_archives[f]; - if(!(strncmp(sat->suffix, str, tl) && - strncmp(sat->suffix+1, str, tl-1))) { + sl = strlen(sat->suffix); + if((tl == sl && !strncmp(sat->suffix, str, tl)) || + (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) { rv |= sat->bit; break; } |