Fossil SCM
Candidate fix for maintaining existing permission bits for partial check-ins.
Commit
33ffb32cb86eab1594956bfc6091cf2ab72d0c37
Parent
ae356a7b2e8f311…
1 file changed
+3
-2
+3
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -708,13 +708,14 @@ | ||
| 708 | 708 | blob_append(&filename, zName, -1); |
| 709 | 709 | |
| 710 | 710 | #if !defined(_WIN32) |
| 711 | 711 | /* For unix, extract the "executable" and "symlink" permissions |
| 712 | 712 | ** directly from the filesystem. On windows, permissions are |
| 713 | - ** unchanged from the original. | |
| 713 | + ** unchanged from the original. However, only do this if the file | |
| 714 | + ** itself is actually selected to be part of this check-in. | |
| 714 | 715 | */ |
| 715 | - { | |
| 716 | + if( isSelected ){ | |
| 716 | 717 | int mPerm; |
| 717 | 718 | |
| 718 | 719 | mPerm = file_wd_perm(blob_str(&filename)); |
| 719 | 720 | isExe = ( mPerm==PERM_EXE ); |
| 720 | 721 | isLink = ( mPerm==PERM_LNK ); |
| 721 | 722 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -708,13 +708,14 @@ | |
| 708 | blob_append(&filename, zName, -1); |
| 709 | |
| 710 | #if !defined(_WIN32) |
| 711 | /* For unix, extract the "executable" and "symlink" permissions |
| 712 | ** directly from the filesystem. On windows, permissions are |
| 713 | ** unchanged from the original. |
| 714 | */ |
| 715 | { |
| 716 | int mPerm; |
| 717 | |
| 718 | mPerm = file_wd_perm(blob_str(&filename)); |
| 719 | isExe = ( mPerm==PERM_EXE ); |
| 720 | isLink = ( mPerm==PERM_LNK ); |
| 721 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -708,13 +708,14 @@ | |
| 708 | blob_append(&filename, zName, -1); |
| 709 | |
| 710 | #if !defined(_WIN32) |
| 711 | /* For unix, extract the "executable" and "symlink" permissions |
| 712 | ** directly from the filesystem. On windows, permissions are |
| 713 | ** unchanged from the original. However, only do this if the file |
| 714 | ** itself is actually selected to be part of this check-in. |
| 715 | */ |
| 716 | if( isSelected ){ |
| 717 | int mPerm; |
| 718 | |
| 719 | mPerm = file_wd_perm(blob_str(&filename)); |
| 720 | isExe = ( mPerm==PERM_EXE ); |
| 721 | isLink = ( mPerm==PERM_LNK ); |
| 722 |