From: Peter Hoffmann <Hoffmann.P@gmx.net>
Date: Thu, 1 Nov 2018 00:36:41 +0000 (+0100)
Subject: fix: Accept web-command cli flags if web-command is commited (#5200)
X-Git-Tag: v1.7.0-dev~140
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=584844eada226f062d46da53e9ba6470ecd58eaa;p=gitea.git

fix: Accept web-command cli flags if web-command is commited (#5200)

* fix: Accept web-command cli flags if web-command is commited

* Added flags of default cmd CmdWeb to app-wide flags
* If command *is* specified app-wide flags are ignored

Resolves: #5065
Signed-off-by: Berengar W. Lehr <Berengar.Lehr@kompetenztest.de>

* Removed style breaking newline

* broken windows need to be fixed
* provides requested change
---

diff --git a/main.go b/main.go
index a331de4733..a0a52c3ae8 100644
--- a/main.go
+++ b/main.go
@@ -49,7 +49,7 @@ arguments - which can alternatively be run by running the subcommand web.`
 		cmd.CmdGenerate,
 		cmd.CmdMigrate,
 	}
-	app.Flags = append(app.Flags, []cli.Flag{}...)
+	app.Flags = append(app.Flags, cmd.CmdWeb.Flags...)
 	app.Action = cmd.CmdWeb.Action
 	err := app.Run(os.Args)
 	if err != nil {