Use GIT-1.5.4.rc4

3 files changed, 2 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index e39be18..a258f64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,31 @@
 CGIT_VERSION = v0.7.2
 CGIT_SCRIPT_NAME = cgit.cgi
 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.8
+GIT_VER = 1.5.4.rc4
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
 	ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
 	ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
 
 
 ifdef NEEDS_LIBICONV
 	EXTLIBS += -liconv
 endif
 
 
 .PHONY: all git test install clean distclean emptycache force-version get-git
 
 all: cgit git
 
 VERSION: force-version
diff --git a/git b/git
-Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c
+Subproject ce33288ea6b81a2f4f5aecd72177bcc8174562a
diff --git a/shared.c b/shared.c
index bf0581f..f063894 100644
--- a/shared.c
+++ b/shared.c
@@ -471,49 +471,49 @@ int cgit_diff_files(const unsigned char *old_sha1,
 		return 1;
 
 	diff_params.flags = XDF_NEED_MINIMAL;
 	emit_params.ctxlen = 3;
 	emit_params.flags = XDL_EMIT_FUNCNAMES;
 	emit_params.find_func = NULL;
 	emit_cb.outf = filediff_cb;
 	emit_cb.priv = fn;
 	xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb);
 	return 0;
 }
 
 void cgit_diff_tree(const unsigned char *old_sha1,
 		    const unsigned char *new_sha1,
 		    filepair_fn fn, const char *prefix)
 {
 	struct diff_options opt;
 	int ret;
 	int prefixlen;
 
 	diff_setup(&opt);
 	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) {
 		opt.nr_paths = 1;
 		opt.paths = &prefix;
 		prefixlen = strlen(prefix);
 		opt.pathlens = &prefixlen;
 	}
 	diff_setup_done(&opt);
 
 	if (old_sha1 && !is_null_sha1(old_sha1))
 		ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);
 	else
 		ret = diff_root_tree_sha1(new_sha1, "", &opt);
 	diffcore_std(&opt);
 	diff_flush(&opt);
 }
 
 void cgit_diff_commit(struct commit *commit, filepair_fn fn)
 {
 	unsigned char *old_sha1 = NULL;
 
 	if (commit->parents)
 		old_sha1 = commit->parents->item->object.sha1;