Fossil SCM
The "branch ls" command should flag private branches with -R.
Commit
016f6c5ec51086591ed666cf048032ab1160337f76f5b09bc55e0e3aec07efc3
Parent
225abb37df48a10…
1 file changed
+1
-1
+1
-1
| --- src/branch.c | ||
| +++ src/branch.c | ||
| @@ -723,11 +723,11 @@ | ||
| 723 | 723 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); |
| 724 | 724 | } |
| 725 | 725 | branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit); |
| 726 | 726 | while( db_step(&q)==SQLITE_ROW ){ |
| 727 | 727 | const char *zBr = db_column_text(&q, 0); |
| 728 | - int isPriv = zCurrent!=0 && db_column_int(&q, 1)==1; | |
| 728 | + int isPriv = db_column_int(&q, 1)==1; | |
| 729 | 729 | const char *zMergeTo = db_column_text(&q, 2); |
| 730 | 730 | int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0; |
| 731 | 731 | if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){ |
| 732 | 732 | continue; |
| 733 | 733 | } |
| 734 | 734 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -723,11 +723,11 @@ | |
| 723 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); |
| 724 | } |
| 725 | branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit); |
| 726 | while( db_step(&q)==SQLITE_ROW ){ |
| 727 | const char *zBr = db_column_text(&q, 0); |
| 728 | int isPriv = zCurrent!=0 && db_column_int(&q, 1)==1; |
| 729 | const char *zMergeTo = db_column_text(&q, 2); |
| 730 | int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0; |
| 731 | if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){ |
| 732 | continue; |
| 733 | } |
| 734 |
| --- src/branch.c | |
| +++ src/branch.c | |
| @@ -723,11 +723,11 @@ | |
| 723 | " WHERE rid=%d AND tagid=%d", vid, TAG_BRANCH); |
| 724 | } |
| 725 | branch_prepare_list_query(&q, brFlags, zBrNameGlob, nLimit); |
| 726 | while( db_step(&q)==SQLITE_ROW ){ |
| 727 | const char *zBr = db_column_text(&q, 0); |
| 728 | int isPriv = db_column_int(&q, 1)==1; |
| 729 | const char *zMergeTo = db_column_text(&q, 2); |
| 730 | int isCur = zCurrent!=0 && fossil_strcmp(zCurrent,zBr)==0; |
| 731 | if( (brFlags & BRL_MERGED) && fossil_strcmp(zCurrent,zMergeTo)!=0 ){ |
| 732 | continue; |
| 733 | } |
| 734 |