summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Keeping <john@keeping.me.uk>2017-02-19 12:02:37 (GMT)
committerLukas Fleischer <lfleischer@lfos.de>2017-08-10 13:15:57 (GMT)
commit7d9b5590f4ffbc5d8a6fe30e3e9715ad4b5ca7bd (patch)
tree9a97912cb9d0e481a93bbf504a7ee966bfdf0fac
parentc0d2423f07099366815856500faec3a69db1701a (diff)
downloadcgit-7d9b5590f4ffbc5d8a6fe30e3e9715ad4b5ca7bd.zip
cgit-7d9b5590f4ffbc5d8a6fe30e3e9715ad4b5ca7bd.tar.gz
cgit-7d9b5590f4ffbc5d8a6fe30e3e9715ad4b5ca7bd.tar.bz2
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.c12
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;