Fossil SCM
Fix name of trunk when using --trunk option
Commit
5488f7dd825620487edf30d6a6e06125944831f7
Parent
fef7e1f91141e9e…
1 file changed
+1
-3
+1
-3
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -1105,13 +1105,11 @@ | ||
| 1105 | 1105 | zBranch = fossil_malloc(lenBranch+1); |
| 1106 | 1106 | memcpy(zBranch, zTemp, lenBranch); |
| 1107 | 1107 | zBranch[lenBranch] = '\0'; |
| 1108 | 1108 | }else |
| 1109 | 1109 | if( strncmp(zPath+nFilter, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){ |
| 1110 | - zBranch = fossil_malloc(gsvn.lenTrunk); | |
| 1111 | - memcpy(zBranch, gsvn.zTrunk, gsvn.lenTrunk-1); | |
| 1112 | - zBranch[gsvn.lenTrunk-1] = '\0'; | |
| 1110 | + zBranch = mprintf("trunk"); | |
| 1113 | 1111 | } |
| 1114 | 1112 | } |
| 1115 | 1113 | return zBranch; |
| 1116 | 1114 | } |
| 1117 | 1115 | |
| 1118 | 1116 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1105,13 +1105,11 @@ | |
| 1105 | zBranch = fossil_malloc(lenBranch+1); |
| 1106 | memcpy(zBranch, zTemp, lenBranch); |
| 1107 | zBranch[lenBranch] = '\0'; |
| 1108 | }else |
| 1109 | if( strncmp(zPath+nFilter, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){ |
| 1110 | zBranch = fossil_malloc(gsvn.lenTrunk); |
| 1111 | memcpy(zBranch, gsvn.zTrunk, gsvn.lenTrunk-1); |
| 1112 | zBranch[gsvn.lenTrunk-1] = '\0'; |
| 1113 | } |
| 1114 | } |
| 1115 | return zBranch; |
| 1116 | } |
| 1117 | |
| 1118 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -1105,13 +1105,11 @@ | |
| 1105 | zBranch = fossil_malloc(lenBranch+1); |
| 1106 | memcpy(zBranch, zTemp, lenBranch); |
| 1107 | zBranch[lenBranch] = '\0'; |
| 1108 | }else |
| 1109 | if( strncmp(zPath+nFilter, gsvn.zTrunk, gsvn.lenTrunk-1)==0 ){ |
| 1110 | zBranch = mprintf("trunk"); |
| 1111 | } |
| 1112 | } |
| 1113 | return zBranch; |
| 1114 | } |
| 1115 | |
| 1116 |