diff options
-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
diff --git a/Makefile b/Makefile index 1f9893a..dc9dffd 100644 --- a/Makefile +++ b/Makefile | |||
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | |||
5 | CGIT_CONFIG = /etc/cgitrc | 5 | CGIT_CONFIG = /etc/cgitrc |
6 | CACHE_ROOT = /var/cache/cgit | 6 | CACHE_ROOT = /var/cache/cgit |
7 | SHA1_HEADER = <openssl/sha.h> | 7 | SHA1_HEADER = <openssl/sha.h> |
8 | GIT_VER = 1.6.3.4 | 8 | GIT_VER = 1.6.4.3 |
9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 9 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 |
10 | INSTALL = install | 10 | INSTALL = install |
11 | 11 | ||
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:: | |||
221 | "Git Repository Browser". | 221 | "Git Repository Browser". |
222 | 222 | ||
223 | snapshots:: | 223 | snapshots:: |
224 | Text which specifies the default (and allowed) set of snapshot formats | 224 | Text which specifies the default set of snapshot formats generated by |
225 | supported by cgit. The value is a space-separated list of zero or more | 225 | cgit. The value is a space-separated list of zero or more of the |
226 | of the following values: | 226 | values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. |
227 | "tar" uncompressed tar-file | ||
228 | "tar.gz" gzip-compressed tar-file | ||
229 | "tar.bz2" bzip-compressed tar-file | ||
230 | "zip" zip-file | ||
231 | Default value: none. | ||
232 | 227 | ||
233 | source-filter:: | 228 | source-filter:: |
234 | Specifies a command which will be invoked to format plaintext blobs | 229 | Specifies a command which will be invoked to format plaintext blobs |
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) | |||
35 | } | 35 | } |
36 | info = cgit_parse_commit(commit); | 36 | info = cgit_parse_commit(commit); |
37 | 37 | ||
38 | load_ref_decorations(); | 38 | load_ref_decorations(DECORATE_FULL_REFS); |
39 | 39 | ||
40 | html("<table summary='commit info' class='commit-info'>\n"); | 40 | html("<table summary='commit info' class='commit-info'>\n"); |
41 | html("<tr><th>author</th><td>"); | 41 | 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 | |||
161 | rev.verbose_header = 1; | 161 | rev.verbose_header = 1; |
162 | rev.show_root_diff = 0; | 162 | rev.show_root_diff = 0; |
163 | setup_revisions(argc, argv, &rev, NULL); | 163 | setup_revisions(argc, argv, &rev, NULL); |
164 | load_ref_decorations(); | 164 | load_ref_decorations(DECORATE_FULL_REFS); |
165 | rev.show_decorations = 1; | 165 | rev.show_decorations = 1; |
166 | rev.grep_filter.regflags |= REG_ICASE; | 166 | rev.grep_filter.regflags |= REG_ICASE; |
167 | compile_grep_patterns(&rev.grep_filter); | 167 | 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, | |||
60 | if (S_ISDIR(mode)) | 60 | if (S_ISDIR(mode)) |
61 | return READ_TREE_RECURSIVE; | 61 | return READ_TREE_RECURSIVE; |
62 | 62 | ||
63 | if (S_ISREG(mode)) | 63 | if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && |
64 | !strcmp(pathname, match_path + baselen)) | ||
64 | print_object(sha1, pathname); | 65 | print_object(sha1, pathname); |
65 | 66 | ||
66 | return 0; | 67 | return 0; |