Fossil SCM
For safety, the --verily option to clean should force all symlinks to be treated as normal content files.
Commit
8fdf8cbe9cb5c72346b2f91d1379b355b6d3a8e0
Parent
39ea7a2f6134c3c…
1 file changed
+6
-4
+6
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -900,13 +900,14 @@ | ||
| 900 | 900 | ** |
| 901 | 901 | ** The default values for --clean, --ignore, and --keep are determined by |
| 902 | 902 | ** the (versionable) clean-glob, ignore-glob, and keep-glob settings. |
| 903 | 903 | ** |
| 904 | 904 | ** The --verily option ignores the keep-glob and ignore-glob settings and |
| 905 | -** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the | |
| 906 | -** --verily option when you really want to clean up everything. Extreme | |
| 907 | -** care should be exercised when using the --verily option. | |
| 905 | +** turns on the options --force, --emptydirs, --dotfiles, --disable-undo, | |
| 906 | +** and --no-dir-symlinks. Use the --verily option when you really want | |
| 907 | +** to clean up everything. Extreme care should be exercised when using | |
| 908 | +** the --verily option. | |
| 908 | 909 | ** |
| 909 | 910 | ** Options: |
| 910 | 911 | ** --allckouts Check for empty directories within any checkouts |
| 911 | 912 | ** that may be nested within the current one. This |
| 912 | 913 | ** option should be used with great care because the |
| @@ -997,11 +998,12 @@ | ||
| 997 | 998 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 998 | 999 | emptyDirsFlag = 1; |
| 999 | 1000 | disableUndo = 1; |
| 1000 | 1001 | scanFlags |= SCAN_ALL; |
| 1001 | 1002 | zCleanFlag = 0; |
| 1002 | - g.fNoDirSymlinks = 1; | |
| 1003 | + g.fNoDirSymlinks = 1; /* Forbid symlink directory traversal. */ | |
| 1004 | + g.allowSymlinks = 1; /* Treat symlink files as content. */ | |
| 1003 | 1005 | } |
| 1004 | 1006 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 1005 | 1007 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 1006 | 1008 | } |
| 1007 | 1009 | if( zKeepFlag==0 && !verilyFlag ){ |
| 1008 | 1010 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -900,13 +900,14 @@ | |
| 900 | ** |
| 901 | ** The default values for --clean, --ignore, and --keep are determined by |
| 902 | ** the (versionable) clean-glob, ignore-glob, and keep-glob settings. |
| 903 | ** |
| 904 | ** The --verily option ignores the keep-glob and ignore-glob settings and |
| 905 | ** turns on --force, --emptydirs, --dotfiles, and --disable-undo. Use the |
| 906 | ** --verily option when you really want to clean up everything. Extreme |
| 907 | ** care should be exercised when using the --verily option. |
| 908 | ** |
| 909 | ** Options: |
| 910 | ** --allckouts Check for empty directories within any checkouts |
| 911 | ** that may be nested within the current one. This |
| 912 | ** option should be used with great care because the |
| @@ -997,11 +998,12 @@ | |
| 997 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 998 | emptyDirsFlag = 1; |
| 999 | disableUndo = 1; |
| 1000 | scanFlags |= SCAN_ALL; |
| 1001 | zCleanFlag = 0; |
| 1002 | g.fNoDirSymlinks = 1; |
| 1003 | } |
| 1004 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 1005 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 1006 | } |
| 1007 | if( zKeepFlag==0 && !verilyFlag ){ |
| 1008 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -900,13 +900,14 @@ | |
| 900 | ** |
| 901 | ** The default values for --clean, --ignore, and --keep are determined by |
| 902 | ** the (versionable) clean-glob, ignore-glob, and keep-glob settings. |
| 903 | ** |
| 904 | ** The --verily option ignores the keep-glob and ignore-glob settings and |
| 905 | ** turns on the options --force, --emptydirs, --dotfiles, --disable-undo, |
| 906 | ** and --no-dir-symlinks. Use the --verily option when you really want |
| 907 | ** to clean up everything. Extreme care should be exercised when using |
| 908 | ** the --verily option. |
| 909 | ** |
| 910 | ** Options: |
| 911 | ** --allckouts Check for empty directories within any checkouts |
| 912 | ** that may be nested within the current one. This |
| 913 | ** option should be used with great care because the |
| @@ -997,11 +998,12 @@ | |
| 998 | verilyFlag = allFileFlag = allDirFlag = 1; |
| 999 | emptyDirsFlag = 1; |
| 1000 | disableUndo = 1; |
| 1001 | scanFlags |= SCAN_ALL; |
| 1002 | zCleanFlag = 0; |
| 1003 | g.fNoDirSymlinks = 1; /* Forbid symlink directory traversal. */ |
| 1004 | g.allowSymlinks = 1; /* Treat symlink files as content. */ |
| 1005 | } |
| 1006 | if( zIgnoreFlag==0 && !verilyFlag ){ |
| 1007 | zIgnoreFlag = db_get("ignore-glob", 0); |
| 1008 | } |
| 1009 | if( zKeepFlag==0 && !verilyFlag ){ |
| 1010 |