Merge branch 'fp/linenumbers'

diff --git a/Makefile b/Makefile
index 1f9893ac81a2f81bbc40726ec6116d3fad318759..dc9dffdce0ca52f82bd310ca1ff8ba3381fd3fd7 100644 (file)
--- 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 ac5c58c539d074f29f3ae742d03a8a1566d2556e..3b16db96c0c2808d2a7d291c76defcf9142f5a3b 100644 (file)
--- 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 e276f018f2c1f0fc962fbe44a36708d1cdebada8..7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit e276f018f2c1f0fc962fbe44a36708d1cdebada8
+Subproject commit 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c4

diff --git a/ui-commit.c b/ui-commit.c
index d6b73eed90aaf5ee232e89f5a1655c94db392577..f5b0ae553be5edfaa58a5b7fbcbef6d9a29eb776 100644 (file)
--- 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 0b37785c3c2a2c396d7cdf3fcac70cce1e20aff2..f3132c964c16a9d909ee13937bd4db670de79fde 100644 (file)
--- 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 27c6daec7f1dc71bfd7b8b74c8179467a5d39224..a4ce077ac512f4735ea693967a5a0b375473bbf7 100644 (file)
--- 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;