| -rw-r--r-- | Makefile | 2 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | html.c | 9 | ||||
| -rwxr-xr-x | tests/t0108-patch.sh | 2 | ||||
| -rw-r--r-- | ui-snapshot.c | 1 |
5 files changed, 5 insertions, 9 deletions
@@ -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.3 +GIT_VER = 1.7.2.2 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install diff --git a/git b/git -Subproject 87b50542a08ac6caa083ddc376e674424e37940 +Subproject 8c67c392e1620fc3b749aa9e0b8da13bd84226f @@ -268,20 +268,19 @@ int hextoint(char c) char *convert_query_hexchar(char *txt) { - int d1, d2, n; - n = strlen(txt); - if (n < 3) { + int d1, d2; + if (strlen(txt) < 3) { *txt = '\0'; return txt-1; } d1 = hextoint(*(txt+1)); d2 = hextoint(*(txt+2)); if (d1<0 || d2<0) { - memmove(txt, txt+3, n-3); + strcpy(txt, txt+3); return txt-1; } else { *txt = d1 * 16 + d2; - memmove(txt+1, txt+3, n-2); + strcpy(txt+1, txt+3); return txt; } } diff --git a/tests/t0108-patch.sh b/tests/t0108-patch.sh index e608104..33351d6 100755 --- a/tests/t0108-patch.sh +++ b/tests/t0108-patch.sh @@ -35,5 +35,3 @@ 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 6e3412c..1b25dca 100644 --- a/ui-snapshot.c +++ b/ui-snapshot.c @@ -92,7 +92,6 @@ 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); |