summaryrefslogtreecommitdiffabout
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Makefile2
m---------git0
-rw-r--r--shared.c2
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index e39be18..a258f64 100644
--- a/Makefile
+++ b/Makefile
@@ -6,3 +6,3 @@ 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
@@ -494,3 +494,3 @@ void cgit_diff_tree(const unsigned char *old_sha1,
opt.rename_limit = cgit_renamelimit;
- opt.recursive = 1;
+ DIFF_OPT_SET(&opt, RECURSIVE);
opt.format_callback = cgit_diff_tree_cb;