author | Lars Hjemli <hjemli@gmail.com> | 2008-01-13 18:16:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-01-21 07:52:09 (UTC) |
commit | 776200b1c10536174f68fc6599fc709ae620db54 (patch) (unidiff) | |
tree | d5b24090675c5ac7b0ca29459d3246dcb0d7c8af | |
parent | 2122c696a34133a616b9ec6d72abe9eb89e728aa (diff) | |
download | cgit-776200b1c10536174f68fc6599fc709ae620db54.zip cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.gz cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.bz2 |
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
@@ -1,15 +1,15 @@ | |||
1 | CGIT_VERSION = v0.7.2 | 1 | CGIT_VERSION = v0.7.2 |
2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | 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 | # |
11 | # Let the user override the above settings. | 11 | # Let the user override the above settings. |
12 | # | 12 | # |
13 | -include cgit.conf | 13 | -include cgit.conf |
14 | 14 | ||
15 | 15 | ||
diff --git a/git b/git | |||
Subproject aadd4efa715f56e0eac5ac459c8ff4933b56d4c | Subproject ce33288ea6b81a2f4f5aecd72177bcc8174562a | ||
@@ -487,17 +487,17 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
487 | struct diff_options opt; | 487 | struct diff_options opt; |
488 | int ret; | 488 | int ret; |
489 | int prefixlen; | 489 | int prefixlen; |
490 | 490 | ||
491 | diff_setup(&opt); | 491 | diff_setup(&opt); |
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) { |
499 | opt.nr_paths = 1; | 499 | opt.nr_paths = 1; |
500 | opt.paths = &prefix; | 500 | opt.paths = &prefix; |
501 | prefixlen = strlen(prefix); | 501 | prefixlen = strlen(prefix); |
502 | opt.pathlens = &prefixlen; | 502 | opt.pathlens = &prefixlen; |
503 | } | 503 | } |