author | Lars Hjemli <hjemli@gmail.com> | 2008-01-13 17:34:37 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-01-13 17:34:37 (UTC) |
commit | 2122c696a34133a616b9ec6d72abe9eb89e728aa (patch) (unidiff) | |
tree | fc3c4693f77b04c1eaf549841d5bae46d9801608 | |
parent | f39c3c99a12154cdafcdc501a821e3fadd3c0602 (diff) | |
parent | b74cc91574a9284d2f6446fd2ef3df6298ed6992 (diff) | |
download | cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.zip cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.gz cgit-2122c696a34133a616b9ec6d72abe9eb89e728aa.tar.bz2 |
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-- | 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
@@ -1,3 +1,3 @@ | |||
1 | CGIT_VERSION = v0.7.1 | 1 | CGIT_VERSION = v0.7.2 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
@@ -5,5 +5,5 @@ CGIT_CONFIG = /etc/cgitrc | |||
5 | CACHE_ROOT = /var/cache/cgit | 5 | CACHE_ROOT = /var/cache/cgit |
6 | SHA1_HEADER = <openssl/sha.h> | 6 | SHA1_HEADER = <openssl/sha.h> |
7 | GIT_VER = 1.5.3.5 | 7 | GIT_VER = 1.5.3.8 |
8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 8 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
9 | 9 | ||
diff --git a/git b/git | |||
Subproject 3f2a7ae2c84c921e11041a5edc2522964fc1cce | Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c | ||
@@ -119,5 +119,5 @@ struct repoinfo *add_repo(const char *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; |
diff --git a/ui-snapshot.c b/ui-snapshot.c index 4d1aa88..dfedd8f 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c | |||
@@ -131,5 +131,5 @@ int cgit_parse_snapshots_mask(const char *str) | |||
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 */ |
@@ -143,6 +143,7 @@ int cgit_parse_snapshots_mask(const char *str) | |||
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; |