From: Lars Hjemli <hjemli@gmail.com>
Date: Sun, 13 Sep 2009 20:01:52 +0000 (+0200)
Subject: Merge branch 'fp/linenumbers'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/5f12e45fe3338095916a444ff106dd9fc9991d84?hp=6638f40868ccf7806a9668560d3608324704c2b7

Merge branch 'fp/linenumbers'
---

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/cgitrc.5.txt b/cgitrc.5.txt
index ac5c58c..3b16db9 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -221,14 +221,9 @@ root-title::
 	"Git Repository Browser".
 
 snapshots::
-	Text which specifies the default (and allowed) set of snapshot formats
-	supported by cgit. The value is a space-separated list of zero or more
-	of the following values:
-		"tar"		uncompressed tar-file
-		"tar.gz"	gzip-compressed tar-file
-		"tar.bz2"	bzip-compressed tar-file
-		"zip"		zip-file
-	Default value: none.
+	Text which specifies the default set of snapshot formats generated by
+	cgit. The value is a space-separated list of zero or more of the
+	values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none.
 
 source-filter::
 	Specifies a command which will be invoked to format plaintext blobs
diff --git a/git b/git
index e276f01..7fb6bcf 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit e276f018f2c1f0fc962fbe44a36708d1cdebada8
+Subproject commit 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4
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);
diff --git a/ui-plain.c b/ui-plain.c
index 27c6dae..a4ce077 100644
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -60,7 +60,8 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
 	if (S_ISDIR(mode))
 		return READ_TREE_RECURSIVE;
 
-	if (S_ISREG(mode))
+	if (S_ISREG(mode) && !strncmp(base, match_path, baselen) &&
+	    !strcmp(pathname, match_path + baselen))
 		print_object(sha1, pathname);
 
 	return 0;