Fossil SCM
Make sure the --emptydirs option is processed even when it is already implied to prevent it from being considered as an 'unrecognized option'.
Commit
f7c022c1416daee4702efd6bad9b0ff4b7967b1b
Parent
238c8dafd070b99…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -552,11 +552,11 @@ | ||
| 552 | 552 | if( !dryRunFlag ){ |
| 553 | 553 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 554 | 554 | } |
| 555 | 555 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 556 | 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | - emptyDirsFlag = dirsOnlyFlag || find_option("emptydirs","d",0)!=0; | |
| 557 | + emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; | |
| 558 | 558 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 559 | 559 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 560 | 560 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 561 | 561 | zIgnoreFlag = find_option("ignore",0,1); |
| 562 | 562 | verboseFlag = find_option("verbose","v",0)!=0; |
| 563 | 563 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -552,11 +552,11 @@ | |
| 552 | if( !dryRunFlag ){ |
| 553 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 554 | } |
| 555 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | emptyDirsFlag = dirsOnlyFlag || find_option("emptydirs","d",0)!=0; |
| 558 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 559 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 560 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 561 | zIgnoreFlag = find_option("ignore",0,1); |
| 562 | verboseFlag = find_option("verbose","v",0)!=0; |
| 563 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -552,11 +552,11 @@ | |
| 552 | if( !dryRunFlag ){ |
| 553 | dryRunFlag = find_option("test",0,0)!=0; /* deprecated */ |
| 554 | } |
| 555 | allFileFlag = allDirFlag = find_option("force","f",0)!=0; |
| 556 | dirsOnlyFlag = find_option("dirsonly",0,0)!=0; |
| 557 | emptyDirsFlag = find_option("emptydirs","d",0)!=0 || dirsOnlyFlag; |
| 558 | if( find_option("dotfiles",0,0)!=0 ) scanFlags |= SCAN_ALL; |
| 559 | if( find_option("temp",0,0)!=0 ) scanFlags |= SCAN_TEMP; |
| 560 | if( find_option("allckouts",0,0)!=0 ) scanFlags |= SCAN_NESTED; |
| 561 | zIgnoreFlag = find_option("ignore",0,1); |
| 562 | verboseFlag = find_option("verbose","v",0)!=0; |
| 563 |