Fossil SCM
Fix a problem in the "fossil patch diff" command introduced by the previous --webpage check-in.
Commit
874e7fa7bbf60a372047261f775cd545f5967c7b5a2189a1433d01f7527486e4
Parent
ea52b7d06cf7c04…
1 file changed
+1
-1
+1
-1
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -724,11 +724,11 @@ | ||
| 724 | 724 | int fIncludeBinary, /* Do diffs against binary files */ |
| 725 | 725 | u64 diffFlags /* Other diff flags */ |
| 726 | 726 | ){ |
| 727 | 727 | int nErr = 0; |
| 728 | 728 | Stmt q; |
| 729 | - int bWebpage = (diffFlags && DIFF_WEBPAGE)!=0; | |
| 729 | + int bWebpage = (diffFlags & DIFF_WEBPAGE)!=0; | |
| 730 | 730 | Blob empty; |
| 731 | 731 | blob_zero(&empty); |
| 732 | 732 | |
| 733 | 733 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 734 | 734 | /* Check to ensure that the patch is against the repository that |
| 735 | 735 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -724,11 +724,11 @@ | |
| 724 | int fIncludeBinary, /* Do diffs against binary files */ |
| 725 | u64 diffFlags /* Other diff flags */ |
| 726 | ){ |
| 727 | int nErr = 0; |
| 728 | Stmt q; |
| 729 | int bWebpage = (diffFlags && DIFF_WEBPAGE)!=0; |
| 730 | Blob empty; |
| 731 | blob_zero(&empty); |
| 732 | |
| 733 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 734 | /* Check to ensure that the patch is against the repository that |
| 735 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -724,11 +724,11 @@ | |
| 724 | int fIncludeBinary, /* Do diffs against binary files */ |
| 725 | u64 diffFlags /* Other diff flags */ |
| 726 | ){ |
| 727 | int nErr = 0; |
| 728 | Stmt q; |
| 729 | int bWebpage = (diffFlags & DIFF_WEBPAGE)!=0; |
| 730 | Blob empty; |
| 731 | blob_zero(&empty); |
| 732 | |
| 733 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 734 | /* Check to ensure that the patch is against the repository that |
| 735 |