From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 19 Sep 2010 16:43:58 +0000 (+0200)
Subject: Merge branch 'lh/readme'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/e76a1ea427792aaa331cdec70d7d4ff1fb3422e0?hp=515edb0da3b9156e07e269621d7474cdea82acaf

Merge branch 'lh/readme'
---

diff --git a/Makefile b/Makefile
index 2a15469..23fdd53 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.2.2
+GIT_VER = 1.7.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
diff --git a/git b/git
index 8c67c39..87b5054 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 8c67c392e1620fc3b749aa9e0b8da13bd84226f8
+Subproject commit 87b50542a08ac6caa083ddc376e674424e37940a
diff --git a/html.c b/html.c
index 337baeb..eaabf72 100644
--- a/html.c
+++ b/html.c
@@ -268,19 +268,20 @@ int hextoint(char c)
 
 char *convert_query_hexchar(char *txt)
 {
-	int d1, d2;
-	if (strlen(txt) < 3) {
+	int d1, d2, n;
+	n = strlen(txt);
+	if (n < 3) {
 		*txt = '\0';
 		return txt-1;
 	}
 	d1 = hextoint(*(txt+1));
 	d2 = hextoint(*(txt+2));
 	if (d1<0 || d2<0) {
-		strcpy(txt, txt+3);
+		memmove(txt, txt+3, n-3);
 		return txt-1;
 	} else {
 		*txt = d1 * 16 + d2;
-		strcpy(txt+1, txt+3);
+		memmove(txt+1, txt+3, n-2);
 		return txt;
 	}
 }
diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh
index 33351d6..e608104 100755
--- a/tests/t0108-patch.sh
+++ b/tests/t0108-patch.sh
@@ -35,3 +35,5 @@ run_test 'generate patch for initial commit' '
 run_test 'find `cgit` signature' '
 	tail -1 trash/tmp | grep -e "^cgit"
 '
+
+tests_done
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 1b25dca..6e3412c 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -92,6 +92,7 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
 	}
 	args.tree = commit->tree;
 	args.time = commit->date;
+	args.compression_level = Z_DEFAULT_COMPRESSION;
 	ctx.page.mimetype = xstrdup(format->mimetype);
 	ctx.page.filename = xstrdup(filename);
 	cgit_print_http_headers(&ctx);