From 7b346647c9d8cc3b4acccecc3ede526dc4b2fb06 Mon Sep 17 00:00:00 2001
From: Evan Martin
Date: Sun, 2 Dec 2007 14:39:30 -0800
Subject: Default repo description to "[no description]"
Otherwise, when you leave out a description for a repository, the NULL
default causes cgit to print out titles like "cgit - (null)".
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
shared.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shared.c b/shared.c
index 6117f5c..84aa281 100644
--- a/shared.c
+++ b/shared.c
@@ -116,7 +116,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";
--
cgit v1.2.3-2-gb3c3
From 2216fd6472fe183439df1a39c1c06974abc3f150 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Mon, 3 Dec 2007 00:39:20 +0100
Subject: Compare string lengths when parsing the snapshot mask
We used to rely on the result from strncmp() without comparing the length of
the strings involved. Even worse, any single-character format specifier would
enable zip-format due to the optional '.'-prefix since the length of the
mask then would become zero.
Noticed-by: Evan Martin <sys@neugierig.org>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
ui-snapshot.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
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;
}
--
cgit v1.2.3-2-gb3c3
From edf0ae3bd7565b39c47fb2b7e0637bcc770c2e43 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Thu, 10 Jan 2008 13:47:18 +0100
Subject: Use GIT-1.5.3.8
---
Makefile | 2 +-
git | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 27e966d..795fb48 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ 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 3f2a7ae..aadd4ef 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 3f2a7ae2c84c921e11041a5edc2522964fc1cce5
+Subproject commit aadd4efa715f56e0eac5ac459c8ff4933b56d4ce
--
cgit v1.2.3-2-gb3c3
From b74cc91574a9284d2f6446fd2ef3df6298ed6992 Mon Sep 17 00:00:00 2001
From: Lars Hjemli
Date: Thu, 10 Jan 2008 13:50:22 +0100
Subject: CGIT 0.7.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 795fb48..68d617e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-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
--
cgit v1.2.3-2-gb3c3