Use GIT-1.5.4.rc4

diff --git a/Makefile b/Makefile
index e39be189a0a51e9d2889ce4e667500b3a0b0cbf1..a258f6447f64b8e59e6d5c83e992ab002898256a 100644 (file)
--- 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>
 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
 
 #
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #

diff --git a/git b/git
index aadd4efa715f56e0eac5ac459c8ff4933b56d4ce..ce33288ea6b81a2f4f5aecd72177bcc8174562ae 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit aadd4efa715f56e0eac5ac459c8ff4933b56d4ce
+Subproject commit ce33288ea6b81a2f4f5aecd72177bcc8174562ae

diff --git a/shared.c b/shared.c
index bf0581f3c1bd23e9a7d5f5d1348a8182db922947..f06389471e132197f8be54d4d1ae4825f3957023 100644 (file)
--- 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.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.format_callback = cgit_diff_tree_cb;
        opt.format_callback_data = fn;
        if (prefix) {