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) {
it' 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=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>refs</a><a class='active' href='/guix/log/po/packages/sv.po'>log</a><a href='/guix/tree/po/packages/sv.po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>tree</a><a href='/guix/commit/po/packages/sv.po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>commit</a><a href='/guix/diff/po/packages/sv.po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/po/packages/sv.po'>
<input type='hidden' name='id' value='4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'/><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=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>root</a>/<a href='/guix/log/po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>po</a>/<a href='/guix/log/po/packages?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>packages</a>/<a href='/guix/log/po/packages/sv.po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1'>sv.po</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/po/packages/sv.po?id=4b8d10ffdb0b2cf9aaf5e774cea6fc56bd9662d1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
495c107f1c0a3be1&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-08-25 00:10:32 -0400'>2022-08-25</span></td><td><a href='/guix/commit/gnu/services/kerberos.scm?id=ee08277a70d29b6d707524a4e17620f50b87adf4'>services: Use the new maybe/unset API.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/home/services/ssh.scm (serialize-address-family): Use the public API of
the maybe infrastructure.
* gnu/services/file-sharing.scm (serialize-maybe-string): Use maybe-value.
(serialize-maybe-file-object): Use maybe-value-set?.
* gnu/services/getmail.scm (getmail-retriever-configuration): Don't use
internals in unset field declarations.
(getmail-destination-configuration): Ditto.
* gnu/services/messaging.scm (raw-content?): Use maybe-value-set?.
(prosody-configuration): Use %unset-value.
* gnu/services/telephony.scm (jami-shepherd-services): Use maybe-value-set?.
(archive-name-&gt;username): Use maybe-value-set?.
* tests/services/configuration.scm ("maybe type, no default"): Use
%unset-value.

Modified-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Signed-off-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
</span></span></td><td>Attila Lendvai</td></tr>
<tr><td><span title='2022-04-29 18:07:16 +0200'>2022-04-29</span></td><td><a href='/guix/commit/gnu/services/kerberos.scm?id=9d7248cd87fbda8c717341a8092780782bef0820'>services: Add missing 'description' fields.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/databases.scm (postgresql-service-type)[description]: New field.
(memcached-service-type)[description]: New field.
(mysql-service-type)[description]: New field.
(redis-service-type)[description]: New field.
* gnu/services/desktop.scm (geoclue-service-type)[description]: New
field.
(udisks-service-type)[description]: New field.
(elogind-service-type)[description]: New field.
(account-service-type)[description]: New field.
* gnu/services/kerberos.scm (krb5-service-type)[description]: New field.
(pam-krb5-service-type)[description]: New field.
* gnu/services/lirc.scm (lirc-service-type)[description]: New field.
* gnu/services/mail.scm (dovecot-service-type)[description]: New field.
(opensmtpd-service-type)[description]: New field.
(mail-aliases-service-type)[description]: New field.
(exim-service-type)[description]: New field.
* gnu/services/monitoring.scm (zabbix-server-service-type)[description]:
New field.
(zabbix-agent-service-type)[description]: New field.
* gnu/services/nfs.scm (rpcbind-service-type)[description]: New field.
(pipefs-service-type)[description]: New field.
(gss-service-type)[description]: New field.
(idmap-service-type)[description]: New field.
* gnu/services/spice.scm (spice-vdagent-service-type)[description]: New field.
* gnu/services/sysctl.scm (sysctl-service-type)[description]: New field.
* gnu/services/virtualization.scm (libvirt-service-type)[description]:
New field.
(virtlog-service-type)[description]: New field.
* gnu/services/vpn.scm (openvpn-server-service-type)[description]: New field.
(openvpn-client-service-type)[description]: New field.
(wireguard-service-type)[description]: New field.
* gnu/services/web.scm (httpd-service-type)[description]: New field.
(fcgiwrap-service-type)[description]: New field.
(agate-service-type)[description]: New field.
[name]: Fix.
</span></span></td><td>Ludovic Courtès</td></tr>