Fossil SCM
Do not allow the (undocumented) --debug option to mess up --tk output.
Commit
d7cf189344086745e52dd1a33467bf602b3fe17d87239570009c5b4456ec2f12
Parent
721c43ba9268dfd…
1 file changed
+1
+1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1210,10 +1210,11 @@ | ||
| 1210 | 1210 | const char *zTempFile = 0; |
| 1211 | 1211 | char *zCmd; |
| 1212 | 1212 | const char *zTclsh; |
| 1213 | 1213 | int bDebug = find_option("tkdebug",0,0)!=0; |
| 1214 | 1214 | int bDarkMode = find_option("dark",0,0)!=0; |
| 1215 | + (void)find_option("debug",0,0); | |
| 1215 | 1216 | blob_zero(&script); |
| 1216 | 1217 | /* Caution: When this routine is called from the merge-info command, |
| 1217 | 1218 | ** the --tcl argument requires an argument. But merge-info does not |
| 1218 | 1219 | ** use -i, so we can take -i as that argument. This routine needs to |
| 1219 | 1220 | ** always have -i after --tcl. |
| 1220 | 1221 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1210,10 +1210,11 @@ | |
| 1210 | const char *zTempFile = 0; |
| 1211 | char *zCmd; |
| 1212 | const char *zTclsh; |
| 1213 | int bDebug = find_option("tkdebug",0,0)!=0; |
| 1214 | int bDarkMode = find_option("dark",0,0)!=0; |
| 1215 | blob_zero(&script); |
| 1216 | /* Caution: When this routine is called from the merge-info command, |
| 1217 | ** the --tcl argument requires an argument. But merge-info does not |
| 1218 | ** use -i, so we can take -i as that argument. This routine needs to |
| 1219 | ** always have -i after --tcl. |
| 1220 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1210,10 +1210,11 @@ | |
| 1210 | const char *zTempFile = 0; |
| 1211 | char *zCmd; |
| 1212 | const char *zTclsh; |
| 1213 | int bDebug = find_option("tkdebug",0,0)!=0; |
| 1214 | int bDarkMode = find_option("dark",0,0)!=0; |
| 1215 | (void)find_option("debug",0,0); |
| 1216 | blob_zero(&script); |
| 1217 | /* Caution: When this routine is called from the merge-info command, |
| 1218 | ** the --tcl argument requires an argument. But merge-info does not |
| 1219 | ** use -i, so we can take -i as that argument. This routine needs to |
| 1220 | ** always have -i after --tcl. |
| 1221 |