about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-01-13 18:34:37 +0100
committerLars Hjemli2008-01-13 18:34:37 +0100
commit2122c696a34133a616b9ec6d72abe9eb89e728aa (patch)
treefc3c4693f77b04c1eaf549841d5bae46d9801608
parentCheck for NULL-subject in patch view (diff)
parentCGIT 0.7.2 (diff)
downloadcgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.gz
cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.zip
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]"
-rw-r--r--Makefile4
m---------git0
-rw-r--r--shared.c2
-rw-r--r--ui-snapshot.c7
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 @@
1CGIT_VERSION = v0.7.1 1CGIT_VERSION = v0.7.2
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.5 7GIT_VER = 1.5.3.8
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9 9
10# 10#
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)
118 ret->url = trim_end(url, '/'); 118 ret->url = trim_end(url, '/');
119 ret->name = ret->url; 119 ret->name = ret->url;
120 ret->path = NULL; 120 ret->path = NULL;
121 ret->desc = NULL; 121 ret->desc = "[no description]";
122 ret->owner = NULL; 122 ret->owner = NULL;
123 ret->group = cgit_repo_group; 123 ret->group = cgit_repo_group;
124 ret->defbranch = "master"; 124 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)
130{ 130{
131 const struct snapshot_archive_t* sat; 131 const struct snapshot_archive_t* sat;
132 static const char *delim = " \t,:/|;"; 132 static const char *delim = " \t,:/|;";
133 int f, tl, rv = 0; 133 int f, tl, sl, rv = 0;
134 134
135 /* favor legacy setting */ 135 /* favor legacy setting */
136 if(atoi(str)) 136 if(atoi(str))
@@ -142,8 +142,9 @@ int cgit_parse_snapshots_mask(const char *str)
142 break; 142 break;
143 for(f=0; f<snapshot_archives_len; f++) { 143 for(f=0; f<snapshot_archives_len; f++) {
144 sat = &snapshot_archives[f]; 144 sat = &snapshot_archives[f];
145 if(!(strncmp(sat->suffix, str, tl) && 145 sl = strlen(sat->suffix);
146 strncmp(sat->suffix+1, str, tl-1))) { 146 if((tl == sl && !strncmp(sat->suffix, str, tl)) ||
147 (tl == sl-1 && !strncmp(sat->suffix+1, str, tl-1))) {
147 rv |= sat->bit; 148 rv |= sat->bit;
148 break; 149 break;
149 } 150 }