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]"

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
 
 #

git

@@ -1 +1 @@
-Subproject commit 3f2a7ae2c84c921e11041a5edc2522964fc1cce5
+Subproject commit aadd4efa715f56e0eac5ac459c8ff4933b56d4ce

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";

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) &&
+			sl = strlen(sat->suffix);
-			     strncmp(sat->suffix+1, str, tl-1))) {
+			if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
+			   (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
 				rv |= sat->bit;
 				break;
 			}