diff options
author | Lars Hjemli <hjemli@gmail.com> | 2008-01-14 03:16:23 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-01-21 16:52:09 (JST) |
commit | 776200b1c10536174f68fc6599fc709ae620db54 (patch) | |
tree | d5b24090675c5ac7b0ca29459d3246dcb0d7c8af | |
parent | 2122c696a34133a616b9ec6d72abe9eb89e728aa (diff) | |
download | cgit-776200b1c10536174f68fc6599fc709ae620db54.zip cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.gz |
Use GIT-1.5.4.rc4
-rw-r--r-- | Makefile | 2 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | shared.c | 2 |
3 files changed, 2 insertions, 2 deletions
@@ -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 | ||
@@ -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) { |