author | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-06-22 14:15:48 (UTC) |
commit | 37a24e4e39737edaa5cdde501346a65eeb280e63 (patch) (unidiff) | |
tree | ff23eb0d57edf108edd1aa3e64a8d6cf70062954 /cgit.h | |
parent | 47187b33be1c3de43fbed6f350ab05bc978aacd0 (diff) | |
parent | a2cbd3c30b64a26b52b2003ba6569f3c083f4092 (diff) | |
download | cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.zip cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.gz cgit-37a24e4e39737edaa5cdde501346a65eeb280e63.tar.bz2 |
Merge branch 'jh/path-limit'
Conflicts:
cgit.h
ui-commit.c
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -118,64 +118,65 @@ struct refinfo { | |||
118 | struct commitinfo *commit; | 118 | struct commitinfo *commit; |
119 | }; | 119 | }; |
120 | }; | 120 | }; |
121 | 121 | ||
122 | struct reflist { | 122 | struct reflist { |
123 | struct refinfo **refs; | 123 | struct refinfo **refs; |
124 | int alloc; | 124 | int alloc; |
125 | int count; | 125 | int count; |
126 | }; | 126 | }; |
127 | 127 | ||
128 | struct cgit_query { | 128 | struct cgit_query { |
129 | int has_symref; | 129 | int has_symref; |
130 | int has_sha1; | 130 | int has_sha1; |
131 | char *raw; | 131 | char *raw; |
132 | char *repo; | 132 | char *repo; |
133 | char *page; | 133 | char *page; |
134 | char *search; | 134 | char *search; |
135 | char *grep; | 135 | char *grep; |
136 | char *head; | 136 | char *head; |
137 | char *sha1; | 137 | char *sha1; |
138 | char *sha2; | 138 | char *sha2; |
139 | char *path; | 139 | char *path; |
140 | char *name; | 140 | char *name; |
141 | char *mimetype; | 141 | char *mimetype; |
142 | char *url; | 142 | char *url; |
143 | char *period; | 143 | char *period; |
144 | int ofs; | 144 | int ofs; |
145 | int nohead; | 145 | int nohead; |
146 | char *sort; | 146 | char *sort; |
147 | int showmsg; | 147 | int showmsg; |
148 | int ssdiff; | 148 | int ssdiff; |
149 | int show_all; | 149 | int show_all; |
150 | char *vpath; | ||
150 | }; | 151 | }; |
151 | 152 | ||
152 | struct cgit_config { | 153 | struct cgit_config { |
153 | char *agefile; | 154 | char *agefile; |
154 | char *cache_root; | 155 | char *cache_root; |
155 | char *clone_prefix; | 156 | char *clone_prefix; |
156 | char *css; | 157 | char *css; |
157 | char *favicon; | 158 | char *favicon; |
158 | char *footer; | 159 | char *footer; |
159 | char *head_include; | 160 | char *head_include; |
160 | char *header; | 161 | char *header; |
161 | char *index_header; | 162 | char *index_header; |
162 | char *index_info; | 163 | char *index_info; |
163 | char *logo; | 164 | char *logo; |
164 | char *logo_link; | 165 | char *logo_link; |
165 | char *module_link; | 166 | char *module_link; |
166 | char *robots; | 167 | char *robots; |
167 | char *root_title; | 168 | char *root_title; |
168 | char *root_desc; | 169 | char *root_desc; |
169 | char *root_readme; | 170 | char *root_readme; |
170 | char *script_name; | 171 | char *script_name; |
171 | char *section; | 172 | char *section; |
172 | char *virtual_root; | 173 | char *virtual_root; |
173 | int cache_size; | 174 | int cache_size; |
174 | int cache_dynamic_ttl; | 175 | int cache_dynamic_ttl; |
175 | int cache_max_create_time; | 176 | int cache_max_create_time; |
176 | int cache_repo_ttl; | 177 | int cache_repo_ttl; |
177 | int cache_root_ttl; | 178 | int cache_root_ttl; |
178 | int cache_scanrc_ttl; | 179 | int cache_scanrc_ttl; |
179 | int cache_static_ttl; | 180 | int cache_static_ttl; |
180 | int embedded; | 181 | int embedded; |
181 | int enable_filter_overrides; | 182 | int enable_filter_overrides; |