about summary refs log tree commit diff
diff options
context:
space:
mode:
authorLars Hjemli <larsh@slackbox.hjemli.net>2009-09-13 21:56:45 +0200
committerLars Hjemli <larsh@slackbox.hjemli.net>2009-09-13 21:56:45 +0200
commit45c49d6cf4b819385dfee620a81e3cb095ed5cd1 (patch)
tree8b9d8543bd3d9584bd81e4b03c6841afc29e9088
parentMerge branch 'stable' (diff)
downloadcgit-pink-45c49d6cf4b819385dfee620a81e3cb095ed5cd1.tar.gz
cgit-pink-45c49d6cf4b819385dfee620a81e3cb095ed5cd1.zip
Use GIT-1.6.4.3
Signed-off-by: Lars Hjemli <larsh@slackbox.hjemli.net>
Diffstat (limited to '')
-rw-r--r--Makefile2
m---------git0
-rw-r--r--ui-commit.c2
-rw-r--r--ui-log.c2
4 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 1f9893a..dc9dffd 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.6.3.4
+GIT_VER = 1.6.4.3
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
 
diff --git a/git b/git
-Subproject e276f018f2c1f0fc962fbe44a36708d1cdebada
+Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c
diff --git a/ui-commit.c b/ui-commit.c
index d6b73ee..f5b0ae5 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -35,7 +35,7 @@ void cgit_print_commit(char *hex)
 	}
 	info = cgit_parse_commit(commit);
 
-	load_ref_decorations();
+	load_ref_decorations(DECORATE_FULL_REFS);
 
 	html("<table summary='commit info' class='commit-info'>\n");
 	html("<tr><th>author</th><td>");
diff --git a/ui-log.c b/ui-log.c
index 0b37785..f3132c9 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -161,7 +161,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 	rev.verbose_header = 1;
 	rev.show_root_diff = 0;
 	setup_revisions(argc, argv, &rev, NULL);
-	load_ref_decorations();
+	load_ref_decorations(DECORATE_FULL_REFS);
 	rev.show_decorations = 1;
 	rev.grep_filter.regflags |= REG_ICASE;
 	compile_grep_patterns(&rev.grep_filter);