-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 11 | ||||
m--------- | git | 0 | ||||
-rw-r--r-- | ui-commit.c | 2 | ||||
-rw-r--r-- | ui-log.c | 2 | ||||
-rw-r--r-- | ui-plain.c | 3 |
6 files changed, 8 insertions, 12 deletions
@@ -7,3 +7,3 @@ 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 diff --git a/cgitrc.5.txt b/cgitrc.5.txt index ac5c58c..3b16db9 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -223,10 +223,5 @@ root-title:: 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. 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 @@ -37,3 +37,3 @@ void cgit_print_commit(char *hex) - load_ref_decorations(); + load_ref_decorations(DECORATE_FULL_REFS); @@ -163,3 +163,3 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern setup_revisions(argc, argv, &rev, NULL); - load_ref_decorations(); + load_ref_decorations(DECORATE_FULL_REFS); rev.show_decorations = 1; @@ -62,3 +62,4 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, - if (S_ISREG(mode)) + if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && + !strcmp(pathname, match_path + baselen)) print_object(sha1, pathname); |