Fossil SCM
Adjust check for bypassing Unicode/CR/NL warning.
Commit
be15485aa6a78209c1060da2ebdd3063399da5f5
Parent
0c2f705c8061359…
1 file changed
+2
-2
+2
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -908,12 +908,12 @@ | ||
| 908 | 908 | const char *zWarning; |
| 909 | 909 | Blob ans; |
| 910 | 910 | char cReply; |
| 911 | 911 | |
| 912 | 912 | if( eType==-1 && fUnicode ){ |
| 913 | - if ( unicodeOk ){ | |
| 914 | - return; /* We don't want unicode warnings for this file. */ | |
| 913 | + if ( crnlOk && unicodeOk ){ | |
| 914 | + return; /* We don't want Unicode/CR/NL warnings for this file. */ | |
| 915 | 915 | } |
| 916 | 916 | zWarning = "Unicode and CR/NL line endings"; |
| 917 | 917 | }else if( eType==-1 ){ |
| 918 | 918 | if( crnlOk ){ |
| 919 | 919 | return; /* We don't want CR/NL warnings for this file. */ |
| 920 | 920 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -908,12 +908,12 @@ | |
| 908 | const char *zWarning; |
| 909 | Blob ans; |
| 910 | char cReply; |
| 911 | |
| 912 | if( eType==-1 && fUnicode ){ |
| 913 | if ( unicodeOk ){ |
| 914 | return; /* We don't want unicode warnings for this file. */ |
| 915 | } |
| 916 | zWarning = "Unicode and CR/NL line endings"; |
| 917 | }else if( eType==-1 ){ |
| 918 | if( crnlOk ){ |
| 919 | return; /* We don't want CR/NL warnings for this file. */ |
| 920 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -908,12 +908,12 @@ | |
| 908 | const char *zWarning; |
| 909 | Blob ans; |
| 910 | char cReply; |
| 911 | |
| 912 | if( eType==-1 && fUnicode ){ |
| 913 | if ( crnlOk && unicodeOk ){ |
| 914 | return; /* We don't want Unicode/CR/NL warnings for this file. */ |
| 915 | } |
| 916 | zWarning = "Unicode and CR/NL line endings"; |
| 917 | }else if( eType==-1 ){ |
| 918 | if( crnlOk ){ |
| 919 | return; /* We don't want CR/NL warnings for this file. */ |
| 920 |