Use GIT-1.5.4.rc5

2 files changed, 1 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index a258f64..6986dc6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,55 +1,55 @@
 CGIT_VERSION = v0.7.2
 CGIT_SCRIPT_NAME = cgit.cgi
 CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.5.4.rc4
+GIT_VER = 1.5.4.rc5
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 
 #
 # Let the user override the above settings.
 #
 -include cgit.conf
 
 
 EXTLIBS = git/libgit.a git/xdiff/lib.a -lz -lcrypto
 OBJECTS = shared.o cache.o parsing.o html.o ui-shared.o ui-repolist.o \
 	ui-summary.o ui-log.o ui-tree.o ui-commit.o ui-diff.o \
 	ui-snapshot.o ui-blob.o ui-tag.o ui-refs.o ui-patch.o
 
 
 ifdef NEEDS_LIBICONV
 	EXTLIBS += -liconv
 endif
 
 
 .PHONY: all git test install clean distclean emptycache force-version get-git
 
 all: cgit git
 
 VERSION: force-version
 	@./gen-version.sh "$(CGIT_VERSION)"
 -include VERSION
 
 
 CFLAGS += -g -Wall -Igit
 CFLAGS += -DSHA1_HEADER='$(SHA1_HEADER)'
 CFLAGS += -DCGIT_VERSION='"$(CGIT_VERSION)"'
 CFLAGS += -DCGIT_CONFIG='"$(CGIT_CONFIG)"'
 CFLAGS += -DCGIT_SCRIPT_NAME='"$(CGIT_SCRIPT_NAME)"'
 CFLAGS += -DCGIT_CACHE_ROOT='"$(CACHE_ROOT)"'
 
 
 cgit: cgit.c $(OBJECTS)
 	$(CC) $(CFLAGS) cgit.c -o cgit $(OBJECTS) $(EXTLIBS)
 
 $(OBJECTS): cgit.h git/xdiff/lib.a git/libgit.a VERSION
 
 git/xdiff/lib.a: | git
 
 git/libgit.a: | git
 
 git:
 	cd git && $(MAKE) xdiff/lib.a
 	cd git && $(MAKE) libgit.a
diff --git a/git b/git
-Subproject ce33288ea6b81a2f4f5aecd72177bcc8174562a
+Subproject bf5aeb150681ed743d317702eaf123c34b05c31