Fossil SCM
Fix to a bug in "fossil setting" output for versioned settings, introduced by the previous check-in.
Commit
ea37cc8ed2f0f86923fc95c5cba03f2f998845e0e69b60059aeb101c71b05aa0
Parent
bdf12f44e64c02d…
1 file changed
+4
-2
M
src/db.c
+4
-2
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -4490,12 +4490,14 @@ | ||
| 4490 | 4490 | if( fossil_strcmp(zVal, pSetting->def)==0 ) noShow = 1; |
| 4491 | 4491 | } |
| 4492 | 4492 | } |
| 4493 | 4493 | } |
| 4494 | 4494 | if( noShow ){ |
| 4495 | - fossil_print("%-24s (versioned)\n", pSetting->name); | |
| 4496 | - versioned = 0; | |
| 4495 | + if( versioned ){ | |
| 4496 | + fossil_print("%-24s (versioned)\n", pSetting->name); | |
| 4497 | + versioned = 0; | |
| 4498 | + } | |
| 4497 | 4499 | }else if( valueOnly ){ |
| 4498 | 4500 | fossil_print("%s\n", db_column_text(&q, 1)); |
| 4499 | 4501 | }else{ |
| 4500 | 4502 | const char *zVal = (const char*)db_column_text(&q,1); |
| 4501 | 4503 | const char *zName = (const char*)db_column_text(&q,0); |
| 4502 | 4504 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4490,12 +4490,14 @@ | |
| 4490 | if( fossil_strcmp(zVal, pSetting->def)==0 ) noShow = 1; |
| 4491 | } |
| 4492 | } |
| 4493 | } |
| 4494 | if( noShow ){ |
| 4495 | fossil_print("%-24s (versioned)\n", pSetting->name); |
| 4496 | versioned = 0; |
| 4497 | }else if( valueOnly ){ |
| 4498 | fossil_print("%s\n", db_column_text(&q, 1)); |
| 4499 | }else{ |
| 4500 | const char *zVal = (const char*)db_column_text(&q,1); |
| 4501 | const char *zName = (const char*)db_column_text(&q,0); |
| 4502 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -4490,12 +4490,14 @@ | |
| 4490 | if( fossil_strcmp(zVal, pSetting->def)==0 ) noShow = 1; |
| 4491 | } |
| 4492 | } |
| 4493 | } |
| 4494 | if( noShow ){ |
| 4495 | if( versioned ){ |
| 4496 | fossil_print("%-24s (versioned)\n", pSetting->name); |
| 4497 | versioned = 0; |
| 4498 | } |
| 4499 | }else if( valueOnly ){ |
| 4500 | fossil_print("%s\n", db_column_text(&q, 1)); |
| 4501 | }else{ |
| 4502 | const char *zVal = (const char*)db_column_text(&q,1); |
| 4503 | const char *zName = (const char*)db_column_text(&q,0); |
| 4504 |