Fossil SCM
Bug fix: Pull public artifacts when --private is not used.
Commit
e3e368c3298ee6908c53fa13ae291646eab22276
Parent
ef1c65a4287c0ad…
1 file changed
+1
-1
+1
-1
| --- src/xfer.c | ||
| +++ src/xfer.c | ||
| @@ -1498,11 +1498,11 @@ | ||
| 1498 | 1498 | int rid; |
| 1499 | 1499 | int isPriv = xfer.nToken>=3 && blob_eq(&xfer.aToken[2],"1"); |
| 1500 | 1500 | rid = rid_from_uuid(&xfer.aToken[1], 0, 0); |
| 1501 | 1501 | if( rid>0 ){ |
| 1502 | 1502 | if( !isPriv ) content_make_public(rid); |
| 1503 | - }else if( !g.okPrivate ){ | |
| 1503 | + }else if( isPriv && !g.okPrivate ){ | |
| 1504 | 1504 | /* ignore private files */ |
| 1505 | 1505 | }else if( pullFlag || cloneFlag ){ |
| 1506 | 1506 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 1507 | 1507 | if( rid ) newPhantom = 1; |
| 1508 | 1508 | } |
| 1509 | 1509 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1498,11 +1498,11 @@ | |
| 1498 | int rid; |
| 1499 | int isPriv = xfer.nToken>=3 && blob_eq(&xfer.aToken[2],"1"); |
| 1500 | rid = rid_from_uuid(&xfer.aToken[1], 0, 0); |
| 1501 | if( rid>0 ){ |
| 1502 | if( !isPriv ) content_make_public(rid); |
| 1503 | }else if( !g.okPrivate ){ |
| 1504 | /* ignore private files */ |
| 1505 | }else if( pullFlag || cloneFlag ){ |
| 1506 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 1507 | if( rid ) newPhantom = 1; |
| 1508 | } |
| 1509 |
| --- src/xfer.c | |
| +++ src/xfer.c | |
| @@ -1498,11 +1498,11 @@ | |
| 1498 | int rid; |
| 1499 | int isPriv = xfer.nToken>=3 && blob_eq(&xfer.aToken[2],"1"); |
| 1500 | rid = rid_from_uuid(&xfer.aToken[1], 0, 0); |
| 1501 | if( rid>0 ){ |
| 1502 | if( !isPriv ) content_make_public(rid); |
| 1503 | }else if( isPriv && !g.okPrivate ){ |
| 1504 | /* ignore private files */ |
| 1505 | }else if( pullFlag || cloneFlag ){ |
| 1506 | rid = content_new(blob_str(&xfer.aToken[1]), isPriv); |
| 1507 | if( rid ) newPhantom = 1; |
| 1508 | } |
| 1509 |