aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | Use absolute path for scanned repo readmeGravatar Dean Scarff2010-11-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | repo.readme is transformed to an absolute path when read from the config, so add_repo needs to add "README.html" with the repository path too. Signed-off-by: Dean Scarff <dos@scarff.id.au> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Makefile: add -MP optionGravatar Lars Hjemli2010-11-08-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Work around errors `make` gives when header files are removed without the Makefile being updated. Signed-off-by: Lynn Lin <Lynn.Lin@emc.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-09-27-1/+1
|\ \ \ | |/ / | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | CGIT 0.8.3.4Gravatar Lars Hjemli2010-09-27-1/+1
| | | | | | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Use GIT-1.7.3Gravatar Lars Hjemli2010-09-27-8/+8
| | | | | | | | | | | | | | | | | | | | | This fixes http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2010-2542. Noticed-by: Silvio Cesare <silvio.cesare@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-09-20-2/+2
|\ \ \ | |/ / | | / | |/ |/|
| * RSS items should always use UTC timesGravatar Aaron Griffin2010-09-20-2/+2
| | | | | | | | | | | | | | | | The format uses a 'Z' suffix, which indicates no TZ offset. Thus we should not respect the local-time config setting here. Signed-off-by: Aaron Griffin <agriffin@datalogics.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'ml/bugfix'Gravatar Lars Hjemli2010-09-20-30/+42
|\ \
| * | prefer html_raw() to write()Gravatar Mark Lodato2010-09-05-12/+12
| | | | | | | | | | | | | | | | | | | | | To make the code more consistent, and to not rely on the implementation of html(), always use html_raw(...) instead of write(htmlfd, ...). Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | ui-repolist: fix redefinition of _XOPEN_SOURCEGravatar Mark Lodato2010-09-05-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, ui-repolist.c set _GNU_SOURCE and then included a standard library before including <git-compat-util.h>. This was a problem, because <git-compat-util.h> redefined _XOPEN_SOURCE, which is set automatically by glibc when _GNU_SOURCE is set. However, <git-compat-util.h> already sets _GNU_SOURCE and includes both <string.h> and <time.h>, so there is no need to define _GNU_SOURCE or include either header within ui-repolist.c. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | fix errors in printf-style format stringsGravatar Mark Lodato2010-09-05-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were many places where the arguments to a printf-like function did not match the format string. Mostly, these were a missing 'l' flag, but there were three exceptions: - In ui-stats.c, a size_t argument must be printed. C99 has the "%zu" flag for this purpose, but not all compilers support this. Therefore, we mimic what git does - use a NO_C99_FORMAT Makefile variable. - In ui-stats.c, cgit_print_error() was called with a pointer instead of a character. - In ui-log.c, the "columns" argument was never used. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * | use __attribute__ to catch printf format mistakesGravatar Mark Lodato2010-09-05-0/+5
| | | | | | | | | | | | | | | | | | | | | Use "__attribute__((format (printf,N,M)))", as is done in git, do catch mistakes in printf-style format strings. Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | | Merge branch 'lh/section-from-path'Gravatar Lars Hjemli2010-09-20-6/+45
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: scan-tree.c
| * | | Add support for 'section-from-path' optionGravatar Lars Hjemli2010-08-22-6/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option can be used to autogenerate section names during scan-path processing. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'lh/readme'Gravatar Lars Hjemli2010-09-20-24/+43
|\ \ \ \
| * | | | Add support for "readme" optionGravatar Lars Hjemli2010-08-22-24/+43
| |/ / / | | | | | | | | | | | | | | | | | | | | The value of this option is used as the default value for repo.readme. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Use GIT-1.7.3Gravatar Lars Hjemli2010-09-19-1/+1
| |/ / |/| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-09-01-0/+1
|\ \ \ | | |/ | |/|
| * | ui-snapshot: actually compress zip archivesGravatar Lars Hjemli2010-09-01-0/+1
| | | | | | | | | | | | | | | | | | | | | Since cgit linked with git-1.6.0 all zip archives has been uncompressed. This patch fixes the issue by specifying Z_DEFAULT_COMPRESSION. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-08-30-4/+7
|\ \ \ | |/ / | | / | |/ |/|
| * html: fix strcpy bug in convert_query_hexcharGravatar Mark Lodato2010-08-30-4/+5
| | | | | | | | | | | | | | | | The source and destination strings in strcpy() may not overlap. Instead, use memmove(), which allows overlap. This fixes test t0104, where 'url=foo%2bbar/tree' was being parsed improperly. Signed-off-by: Mark Lodato <lodatom@gmail.com>
| * t0108-patch: add 'tests_done' to endGravatar Mark Lodato2010-08-30-0/+2
| | | | | | | | Signed-off-by: Mark Lodato <lodatom@gmail.com>
* | Use GIT-1.7.2.2Gravatar Lars Hjemli2010-08-22-10/+10
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Support refspecs in about-filter.Gravatar Jason A. Donenfeld2010-08-21-7/+63
| | | | | | | | | | Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | Merge branch 'jd/gitolite'Gravatar Lars Hjemli2010-08-04-17/+116
|\ \
| * | Add support for 'enable-gitweb-owner' optionGravatar Jason A. Donenfeld2010-08-04-9/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled (which it is by default), cgit will lookup the 'gitweb.owner' setting in each git config file found when processing the 'scan-path' option. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for 'remove-suffix' optionGravatar Jason A. Donenfeld2010-08-04-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | When this option is enabled, the '.git' suffix of repository directories found while processing the 'scan-path' option will be removed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | Add support for 'project-list' optionGravatar Jason A. Donenfeld2010-08-04-8/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | This option specifies the location of a projectlist file as used by gitweb - when 'scan-tree' is later specified, only the projects listed in the projectlist file will be added. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'js/notes'Gravatar Lars Hjemli2010-08-04-0/+57
|\ \ \
| * | | ui-log: Display git notes when presentGravatar Jeff Smith2010-08-04-0/+23
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | ui-commit: Display git notes when presentGravatar Jeff Smith2010-08-04-0/+34
| |/ / | | | | | | | | | | | | Signed-off-by: Jeff Smith <whydoubt@yahoo.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | Merge branch 'stable'Gravatar Lars Hjemli2010-08-04-13/+15
|\ \ \ | |/ / |/| / | |/
| * CGIT 0.8.3.3Gravatar Lars Hjemli2010-08-04-1/+1
| | | | | | | | Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * ui-refs.c: avoid segfault on unparsed ref objectsGravatar Lars Hjemli2010-08-04-12/+14
| | | | | | | | | | | | | | | | When a ref refers to something other then a commit or tag object, cgit could segfault when trying to display the tag info. Noticed-by: Eugene Sajine <euguess@gmail.com> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | commit-links.sh: Seperate the expressions for filtering commit messages.Gravatar Jeff Smith2010-07-23-7/+9
| | | | | | | | | | This allows for putting descriptions closer to their expressions. It should also make it clearer how to apply an expression conditionally.
* | Makefile: do not include dependency-file on `make clean`Gravatar Lynn Lin2010-07-23-1/+3
| | | | | | | | | | When envoking clean target, make should not perform the dependency file generation triggered by include.
* | Merge branch 'jh/ignorews'Gravatar Lars Hjemli2010-07-18-12/+40
|\ \
| * | ui-diff: Add link to ignore/show whitespace changes in diffsGravatar Johan Herland2010-07-18-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a link to the "Diffstat" line to ignore/show whitespace changes in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.ignorews variable. Signed-off-by: Johan Herland <johan@herland.net>
| * | Add URL parameter 'ignorews' for optionally ignoring whitespace in diffsGravatar Johan Herland2010-07-18-12/+25
| | | | | | | | | | | | | | | | | | | | | | | | The new ctx.qry.ignorews variable is passed via cgit_diff_files() and cgit_diff_tree() to Git's diff machinery. This is equivalent to passing --ignore-all-space to 'git diff'. Signed-off-by: Johan Herland <johan@herland.net>
* | | Merge branch 'lh/macros'Gravatar Lars Hjemli2010-07-18-5/+78
|\ \ \
| * | | Add support for environment variable expansionGravatar Lars Hjemli2010-03-22-5/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch teaches cgit to expand environment variables in certain cgitrc option values (cache_root, scan-path, include) plus when finding the location of cgitrc itself. One use case for this feature is virtual hosting - e.g. by setting $CGIT_CONFIG='/etc/cgitrc/$HTTP_HOST' in httpd.conf, all virtual hosts automatically gets their own cgitrc. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'stable'Gravatar Lars Hjemli2010-07-14-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Reencode author and committerGravatar Rémi Lagacé2010-07-14-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a commit has a specific encoding, this encoding also applies to the author and committer name and email. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | Merge branch 'lh/range-search'Gravatar Lars Hjemli2010-06-22-4/+8
|\ \ \ \
| * | | | ui-log.c: allow commit range as search expressionGravatar Lars Hjemli2010-06-19-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'jh/context-lines'Gravatar Lars Hjemli2010-06-22-8/+34
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: cgit.c cgit.h
| * | | | ui-diff: Add links to increase/decrease number of context lines in diffsGravatar Johan Herland2010-06-19-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two links to the "Diffstat" line to show more/less context lines in the generated diff. To support this, cgit_commit_link() and cgit_diff_link() has learned to preserve the ctx.qry.context variable. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
| * | | | Add URL parameter 'context' for changing the number of context lines in diffsGravatar Johan Herland2010-06-19-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new ctx.qry.context variable is picked up by cgit_print_diff(), and passed via cgit_diff_files() to Git's diff machinery. Signed-off-by: Johan Herland <johan@herland.net> Signed-off-by: Lars Hjemli <hjemli@gmail.com>
* | | | | Merge branch 'jh/path-limit'Gravatar Lars Hjemli2010-06-22-164/+275
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | Conflicts: cgit.h ui-commit.c
| * | | ui-shared.c: path-limit style nitpickGravatar Lars Hjemli2010-06-19-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | This subjectively makes the path-limit bar less visually intrusive. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
generated by cgit v0.10.1 at 2024-11-10 14:04:14 (JST)