| -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, 12 insertions, 8 deletions
@@ -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.4.3 +GIT_VER = 1.6.3.4 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 3b16db9..ac5c58c 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -221,9 +221,14 @@ root-title:: "Git Repository Browser". snapshots:: - 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. + 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. source-filter:: Specifies a command which will be invoked to format plaintext blobs diff --git a/git b/git -Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c +Subproject e276f018f2c1f0fc962fbe44a36708d1cdebada diff --git a/ui-commit.c b/ui-commit.c index f5b0ae5..d6b73ee 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(DECORATE_FULL_REFS); + load_ref_decorations(); html("<table summary='commit info' class='commit-info'>\n"); html("<tr><th>author</th><td>"); @@ -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(DECORATE_FULL_REFS); + load_ref_decorations(); rev.show_decorations = 1; rev.grep_filter.regflags |= REG_ICASE; compile_grep_patterns(&rev.grep_filter); @@ -60,8 +60,7 @@ 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) && !strncmp(base, match_path, baselen) && - !strcmp(pathname, match_path + baselen)) + if (S_ISREG(mode)) print_object(sha1, pathname); return 0; |