From 776200b1c10536174f68fc6599fc709ae620db54 Mon Sep 17 00:00:00 2001 From: Lars Hjemli Date: Sun, 13 Jan 2008 19:16:23 +0100 Subject: Use GIT-1.5.4.rc4 --- Makefile | 2 +- git | 2 +- shared.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e39be18..a258f64 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 = -GIT_VER = 1.5.3.8 +GIT_VER = 1.5.4.rc4 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 # diff --git a/git b/git index aadd4ef..ce33288 160000 --- a/git +++ b/git @@ -1 +1 @@ -Subproject commit aadd4efa715f56e0eac5ac459c8ff4933b56d4ce +Subproject commit ce33288ea6b81a2f4f5aecd72177bcc8174562ae diff --git a/shared.c b/shared.c index bf0581f..f063894 100644 --- a/shared.c +++ b/shared.c @@ -492,7 +492,7 @@ void cgit_diff_tree(const unsigned char *old_sha1, opt.output_format = DIFF_FORMAT_CALLBACK; opt.detect_rename = 1; opt.rename_limit = cgit_renamelimit; - opt.recursive = 1; + DIFF_OPT_SET(&opt, RECURSIVE); opt.format_callback = cgit_diff_tree_cb; opt.format_callback_data = fn; if (prefix) { -- cgit v1.2.3-59-g8ed1b