Backported from upstream PR: https://github.com/urfave/cli/pull/1299
---
diff --git a/app_test.go b/app_test.go
index 33024ff..6b3aaa3 100644
--- a/app_test.go
+++ b/app_test.go
@@ -513,18 +513,18 @@ func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
 func TestApp_RunAsSubCommandIncorrectUsage(t *testing.T) {
 	a := App{
 		Flags: []Flag{
-			StringFlag{Name: "--foo"},
+			StringFlag{Name: "foo"},
 		},
 		Writer: bytes.NewBufferString(""),
 	}
 
 	set := flag.NewFlagSet("", flag.ContinueOnError)
-	_ = set.Parse([]string{"", "---foo"})
+	_ = set.Parse([]string{"", "-bar"})
 	c := &Context{flagSet: set}
 
 	err := a.RunAsSubcommand(c)
 
-	expect(t, err, errors.New("bad flag syntax: ---foo"))
+	expect(t, err.Error(), "flag provided but not defined: -bar")
 }
 
 func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) {
koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=cdba91486a60bbba727d843707322f98f8286124'>refs</a><a class='active' href='/guix/log/gnu/services/admin.scm?showmsg=1'>log</a><a href='/guix/tree/gnu/services/admin.scm?id=cdba91486a60bbba727d843707322f98f8286124'>tree</a><a href='/guix/commit/gnu/services/admin.scm?id=cdba91486a60bbba727d843707322f98f8286124'>commit</a><a href='/guix/diff/gnu/services/admin.scm?id=cdba91486a60bbba727d843707322f98f8286124'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/admin.scm'>
<input type='hidden' name='id' value='cdba91486a60bbba727d843707322f98f8286124'/><input type='hidden' name='showmsg' value='1'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=cdba91486a60bbba727d843707322f98f8286124&amp;showmsg=1'>root</a>/<a href='/guix/log/gnu?id=cdba91486a60bbba727d843707322f98f8286124&amp;showmsg=1'>gnu</a>/<a href='/guix/log/gnu/services?id=cdba91486a60bbba727d843707322f98f8286124&amp;showmsg=1'>services</a>/<a href='/guix/log/gnu/services/admin.scm?id=cdba91486a60bbba727d843707322f98f8286124&amp;showmsg=1'>admin.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/admin.scm?id=cdba91486a60bbba727d843707322f98f8286124'>Collapse</a>)</th><th class='left'>Author</th></tr>
<tr class='logheader'><td><span title='2019-06-15 18:15:23 +0200'>2019-06-15</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/admin.scm?id=f3d797005374e5333c7596fe86b4a524ab1b9b11'>services: Remove unneeded imports that led to cycles.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
Fixes &lt;https://bugs.gnu.org/36207&gt;.
Reported by Jack Hill &lt;jackhill@jackhill.us&gt;.

* gnu/services/admin.scm: Remove unneeded import of (gnu services
base).
* gnu/services/mcron.scm: Likewise.


</td></tr>
<tr class='logheader'><td><span title='2018-12-23 17:57:06 +0100'>2018-12-23</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/admin.scm?id=83715a7eec81f41a4163a3230d0d8bbbfeb0a5ed'>services: Fix typo in (gnu services admin).</a></td><td>Tobias Geerinckx-Rice</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/admin.scm: Fix typo in licence header.


</td></tr>
<tr class='logheader'><td><span title='2018-10-04 09:32:51 +0200'>2018-10-04</span></td><td class='logsubject'><a href='/guix/commit/gnu/services/admin.scm?id=89fdd9ee0cc8817283449b33a8c1a2604c575c7e'>services: rottlog: Use command strings in the mcron jobs.</a></td><td>Ludovic Courtès</td></tr>
<tr class='nohover-highlight'><td/><td colspan='3' class='logmsg'>
* gnu/services/admin.scm (default-jobs): Remove the lambda around
"/…/bin/rottlog" to make "herd schedule mcron" more
transparent (otherwise it just says "Lambda function").


</td></tr>