summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-01-13 18:16:23 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-01-21 07:52:09 (UTC)
commit776200b1c10536174f68fc6599fc709ae620db54 (patch) (unidiff)
treed5b24090675c5ac7b0ca29459d3246dcb0d7c8af
parent2122c696a34133a616b9ec6d72abe9eb89e728aa (diff)
downloadcgit-776200b1c10536174f68fc6599fc709ae620db54.zip
cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.gz
cgit-776200b1c10536174f68fc6599fc709ae620db54.tar.bz2
Use GIT-1.5.4.rc4
Diffstat (more/less context) (show 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
@@ -1,19 +1,19 @@
1CGIT_VERSION = v0.7.2 1CGIT_VERSION = v0.7.2
2CGIT_SCRIPT_NAME = cgit.cgi 2CGIT_SCRIPT_NAME = cgit.cgi
3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit 3CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
4CGIT_CONFIG = /etc/cgitrc 4CGIT_CONFIG = /etc/cgitrc
5CACHE_ROOT = /var/cache/cgit 5CACHE_ROOT = /var/cache/cgit
6SHA1_HEADER = <openssl/sha.h> 6SHA1_HEADER = <openssl/sha.h>
7GIT_VER = 1.5.3.8 7GIT_VER = 1.5.4.rc4
8GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 8GIT_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
16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto 16EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \ 17OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \ 18 ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o 19 ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
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
@@ -483,25 +483,25 @@ int cgit_diff_files(const unsigned char *old_sha1,
483void cgit_diff_tree(const unsigned char *old_sha1, 483void cgit_diff_tree(const unsigned char *old_sha1,
484 const unsigned char *new_sha1, 484 const unsigned char *new_sha1,
485 filepair_fn fn, const char *prefix) 485 filepair_fn fn, const char *prefix)
486{ 486{
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 }
504 diff_setup_done(&opt); 504 diff_setup_done(&opt);
505 505
506 if (old_sha1 && !is_null_sha1(old_sha1)) 506 if (old_sha1 && !is_null_sha1(old_sha1))
507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); 507 ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt);