Include CLI's tip for -- in all builds. Better show optionality of its non-option...

FossilOrigin-Name: 9e2c771daad485d923751fdee0316b195bb49ec9f865f2e39565906edeaa5cf8

diff --git a/manifest b/manifest
index 0409e43fbb6286f19b50c55cc0c4d7bdb3fa7c3f..22d26facf433f0d99797ec610b1b8658e2a1148d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C The\scheck-in\sat\s[198b3e33dcfd74c7]\scaused\sa\sperformance\sregression\sfor\ssome\nqueries,\swhich\sis\shere\sfixed.\s\sProblem\sreported\sby\n[forum:/forumpost/b405033490fa56d9|forum\spost\sb405033490fa56d9].
-D 2023-03-11T23:21:21.156
+C Include\sCLI's\stip\sfor\s--\sin\sall\sbuilds.\sBetter\sshow\soptionality\sof\sits\snon-option\sarguments.
+D 2023-03-13T16:08:44.440
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -626,7 +626,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 4233c3030341bf1a21cea90890e6b3d3531721acc62ede147e899d36ffad8238
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 64a4b48a14f5d19a5ddc4afde37a435aebb92113f52653f8fe9e69fc3e9ff9aa
-F src/shell.c.in 7ade4506b907025a0d19e31f85d1200bfbd1eed48e94cea013b669d3efe5073c
+F src/shell.c.in 3c62d4b5278a3d267a40aee82fefdd9324b59449bee983859040577838e6ae50
 F src/sqlite.h.in f01033703156615566bb329144d736a37fc35a278049db91127782a9c799b938
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2050,8 +2050,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 30d95a12eb8b1cfc8ed11d3ed68cd713993ba34efa2fe623c18cfe41f14df1d9
-R 79587856954d09f32d5a8e1654d18654
-U drh
-Z 3f25d641e3ecb8ffdac28f15dbcf5caf
+P dc9f025dc43cb8008e7d8d644175d8b2d084e602a1513803c40c513d1e99fea4
+R 8d1fcb1706ba67304c10514cf5da8048
+U larrybr
+Z e91cad60d50b03b49ea4a130f780deed
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index bcb371e0b4d5b0b72d52ab6016688c1291480d4c..cb22a1be627f85ccaa9e949bf6cae0075be03267 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-dc9f025dc43cb8008e7d8d644175d8b2d084e602a1513803c40c513d1e99fea4
\ No newline at end of file
+9e2c771daad485d923751fdee0316b195bb49ec9f865f2e39565906edeaa5cf8
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 33bf0fad83ed1d066df541b2d0e043d435d790d3..892c3a5aa9a425de12061ee2c402a180d7838952 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -11667,8 +11667,8 @@ static void process_sqliterc(
 ** Show available command line options
 */
 static const char zOptions[] =
+  "   --                   treat no subsequent arguments as options\n"
 #if defined(SQLITE_HAVE_ZLIB) && !defined(SQLITE_OMIT_VIRTUALTABLE)
-  "   --                   treat none of arguments following as options\n"
   "   -A ARGS...           run \".archive ARGS\" and exit\n"
 #endif
   "   -append              append the database to the end of the file\n"
@@ -11730,7 +11730,7 @@ static const char zOptions[] =
 ;
 static void usage(int showDetail){
   utf8_printf(stderr,
-      "Usage: %s [OPTIONS] [FILENAME] [SQL]\n"
+      "Usage: %s [OPTIONS] [FILENAME [SQL]]\n"
       "FILENAME is the name of an SQLite database. A new database is created\n"
       "if the file does not previously exist. Defaults to :memory:.\n", Argv0);
   if( showDetail ){