Merge branch 'lh/readme'

diff --git a/Makefile b/Makefile
index 2a15469c688a75b8a6cca1f5d930b693c2d6f830..23fdd53d2b382fb2c71f0077d9e39e8f03704789 100644 (file)
--- 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 8c67c392e1620fc3b749aa9e0b8da13bd84226f8..87b50542a08ac6caa083ddc376e674424e37940a 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 8c67c392e1620fc3b749aa9e0b8da13bd84226f8
+Subproject commit 87b50542a08ac6caa083ddc376e674424e37940a

diff --git a/html.c b/html.c
index 337baebea5c8c9540f2b4dcf2ee4895e9e5cdd74..eaabf7274eca79c7f9391f50130ff82e99199879 100644 (file)
--- 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 33351d6df592421be4fdf13d2f44f2c27257fa7e..e608104733c299340c472eac9ed6e0408b966cd5 100755 (executable)
--- 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 1b25dca046517819bc02d638e0bf371be8d37f4c..6e3412c9e3a6b3175475e0b7a0b4c5433850f612 100644 (file)
--- 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);