3 files changed, 2 insertions, 2 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 = <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
 #
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

@@ -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) {

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
4	CGIT_CONFIG = /etc/cgitrc	4	CGIT_CONFIG = /etc/cgitrc
5	CACHE_ROOT = /var/cache/cgit	5	CACHE_ROOT = /var/cache/cgit
6	SHA1_HEADER = <openssl/sha.h>	6	SHA1_HEADER = <openssl/sha.h>
7	GIT_VER = 1.5.3.8	7	GIT_VER = 1.5.4.rc4
8	GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2	8	GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
9		9
10	#	10	#


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
@@ -492,7 +492,7 @@ void cgit_diff_tree(const unsigned char *old_sha1,
492	opt.output_format = DIFF_FORMAT_CALLBACK;	492	opt.output_format = DIFF_FORMAT_CALLBACK;
493	opt.detect_rename = 1;	493	opt.detect_rename = 1;
494	opt.rename_limit = cgit_renamelimit;	494	opt.rename_limit = cgit_renamelimit;
495	opt.recursive = 1;	495	DIFF_OPT_SET(&opt, RECURSIVE);
496	opt.format_callback = cgit_diff_tree_cb;	496	opt.format_callback = cgit_diff_tree_cb;
497	opt.format_callback_data = fn;	497	opt.format_callback_data = fn;
498	if (prefix) {	498	if (prefix) {