summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2014-06-28 13:55:06 +0000
committerJason A. Donenfeld <Jason@zx2c4.com>2014-06-28 13:57:02 +0000
commit4046e8ef66225928a4f0d2cd71479e401faf7c3b (patch)
treec460eb32a801d2f31b4f3b99b0cfd4107029c64f
parent79c985e13c10b498c3ea62f4607c2e2a460c3b10 (diff)
downloadcgit-4046e8ef66225928a4f0d2cd71479e401faf7c3b.tar
cgit-4046e8ef66225928a4f0d2cd71479e401faf7c3b.tar.gz
cgit-4046e8ef66225928a4f0d2cd71479e401faf7c3b.zip
ui-log: ignore unhandled arguments
If you search for a bogus range string here: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/ Using something like "range" and "qwerty123456", it returns an "Internal Server Error" and the following in the logs: > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] fatal: > ambiguous argument 'qwerty123456': unknown revision or path not in the > working tree., referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Use '--' to > separate paths from revisions, like this:, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] 'git <command> > [<revision>...] -- [<file>...]', referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Premature end > of script headers: cgit, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ The cache will kick in, so if you search for the same string again, it'll show an empty range, so you have to change the bogus strings each time. This is because we just pass the arguments straight to Git's revision parsing machinery which die()s if it cannot parse an argument, printing the above to stderr and exiting. The patch below makes it a bit friendlier by just ignoring unhandled arguments, but I can't see an easy way to report errors when we can't parse revision arguments without losing the flexibility of supporting all of the revision specifiers supported by Git. Reported-by: Konstantin Ryabitsev <mricon@kernel.org>
-rw-r--r--ui-log.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui-log.c b/ui-log.c
index 2de8017..b5846e4 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -337,16 +337,16 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
else if (commit_sort == 2)
argv_array_push(&rev_argv, "--topo-order");
- if (path) {
- argv_array_push(&rev_argv, "--");
+ argv_array_push(&rev_argv, "--");
+ if (path)
argv_array_push(&rev_argv, path);
- }
init_revisions(&rev, NULL);
rev.abbrev = DEFAULT_ABBREV;
rev.commit_format = CMIT_FMT_DEFAULT;
rev.verbose_header = 1;
rev.show_root_diff = 0;
+ rev.ignore_missing = 1;
setup_revisions(rev_argv.argc, rev_argv.argv, &rev, NULL);
load_ref_decorations(DECORATE_FULL_REFS);
rev.show_decorations = 1;