diff options
| author | John Keeping <john@keeping.me.uk> | 2017-02-19 12:02:37 +0000 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-08-10 16:05:07 +0200 |
| commit | 113f4b85886bc5eb6b319fd048623b8d43b7bce0 (patch) | |
| tree | e82c10650e3b0b2c33d3ec955a3e44d853a5f431 | |
| parent | parsing: clear query path before starting (diff) | |
| download | cgit-pink-113f4b85886bc5eb6b319fd048623b8d43b7bce0.tar.gz cgit-pink-113f4b85886bc5eb6b319fd048623b8d43b7bce0.zip | |
cgit: don't set vpath unless repo is set
After the previous two patches, this can be classified as a tidy up rather than a bug fix, but I think it makes sense to group all of the tests together before setting up the environment for the command to execute. Signed-off-by: John Keeping <john@keeping.me.uk>
| -rw-r--r-- | cgit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cgit.c b/cgit.c index 1075753..1dae4b8 100644 --- a/cgit.c +++ b/cgit.c @@ -726,18 +726,18 @@ static void process_request(void) return; } - /* If cmd->want_vpath is set, assume ctx.qry.path contains a "virtual" - * in-project path limit to be made available at ctx.qry.vpath. - * Otherwise, no path limit is in effect (ctx.qry.vpath = NULL). - */ - ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL; - if (cmd->want_repo && !ctx.repo) { cgit_print_error_page(400, "Bad request", "No repository selected"); return; } + /* If cmd->want_vpath is set, assume ctx.qry.path contains a "virtual" + * in-project path limit to be made available at ctx.qry.vpath. + * Otherwise, no path limit is in effect (ctx.qry.vpath = NULL). + */ + ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL; + if (ctx.repo && prepare_repo_cmd()) return; |