Merge branch 'stable'

* stable:
  CGIT 0.7.2
  Use GIT-1.5.3.8
  Compare string lengths when parsing the snapshot mask
  Default repo description to "[no description]"

diff --git a/Makefile b/Makefile
index eed59df2914db988fdf116ad48d4d0b7778f1377..e39be189a0a51e9d2889ce4e667500b3a0b0cbf1 100644 (file)
--- 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
index 3f2a7ae2c84c921e11041a5edc2522964fc1cce5..aadd4efa715f56e0eac5ac459c8ff4933b56d4ce 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 3f2a7ae2c84c921e11041a5edc2522964fc1cce5
+Subproject commit aadd4efa715f56e0eac5ac459c8ff4933b56d4ce

diff --git a/shared.c b/shared.c
index 9c992c8adb3834fa41cfb5e6a453d43dc17a0580..bf0581f3c1bd23e9a7d5f5d1348a8182db922947 100644 (file)
--- 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 4d1aa886cc43d356b522e42b0e498d6c850b4ecd..dfedd8f490f344f06c2fb665c3af5e33b5239466 100644 (file)
--- 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;
                        }