Fossil SCM
Fix the --tag feature of the commit command that was broken by a recent check-in.
Commit
c42aaa259f2b3595856d7e7da413e7279faf0319
Parent
f9e190e7a7887ca…
1 file changed
+2
-3
+2
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1143,11 +1143,10 @@ | ||
| 1143 | 1143 | int testRun; /* True for a test run. Debugging only */ |
| 1144 | 1144 | CheckinInfo sCiInfo; /* Information about this check-in */ |
| 1145 | 1145 | const char *zComFile; /* Read commit message from this file */ |
| 1146 | 1146 | int nTag = 0; /* Number of --tag arguments */ |
| 1147 | 1147 | const char *zTag; /* A single --tag argument */ |
| 1148 | - const char **azTag = 0;/* Array of all --tag arguments */ | |
| 1149 | 1148 | Blob manifest; /* Manifest in baseline form */ |
| 1150 | 1149 | Blob muuid; /* Manifest uuid */ |
| 1151 | 1150 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1152 | 1151 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1153 | 1152 | int szD; /* Size of the delta manifest */ |
| @@ -1201,12 +1200,12 @@ | ||
| 1201 | 1200 | verify_all_options(); |
| 1202 | 1201 | |
| 1203 | 1202 | /* Escape special characters in tags and put all tags in sorted order */ |
| 1204 | 1203 | if( nTag ){ |
| 1205 | 1204 | int i; |
| 1206 | - for(i=0; i<nTag; i++) azTag[i] = mprintf("%F", azTag[i]); | |
| 1207 | - qsort((void*)azTag, nTag, sizeof(azTag[0]), tagCmp); | |
| 1205 | + for(i=0; i<nTag; i++) sCiInfo.azTag[i] = mprintf("%F", sCiInfo.azTag[i]); | |
| 1206 | + qsort((void*)sCiInfo.azTag, nTag, sizeof(sCiInfo.azTag[0]), tagCmp); | |
| 1208 | 1207 | } |
| 1209 | 1208 | |
| 1210 | 1209 | /* So that older versions of Fossil (that do not understand delta- |
| 1211 | 1210 | ** manifest) can continue to use this repository, do not create a new |
| 1212 | 1211 | ** delta-manifest unless this repository already contains one or more |
| 1213 | 1212 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1143,11 +1143,10 @@ | |
| 1143 | int testRun; /* True for a test run. Debugging only */ |
| 1144 | CheckinInfo sCiInfo; /* Information about this check-in */ |
| 1145 | const char *zComFile; /* Read commit message from this file */ |
| 1146 | int nTag = 0; /* Number of --tag arguments */ |
| 1147 | const char *zTag; /* A single --tag argument */ |
| 1148 | const char **azTag = 0;/* Array of all --tag arguments */ |
| 1149 | Blob manifest; /* Manifest in baseline form */ |
| 1150 | Blob muuid; /* Manifest uuid */ |
| 1151 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1152 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1153 | int szD; /* Size of the delta manifest */ |
| @@ -1201,12 +1200,12 @@ | |
| 1201 | verify_all_options(); |
| 1202 | |
| 1203 | /* Escape special characters in tags and put all tags in sorted order */ |
| 1204 | if( nTag ){ |
| 1205 | int i; |
| 1206 | for(i=0; i<nTag; i++) azTag[i] = mprintf("%F", azTag[i]); |
| 1207 | qsort((void*)azTag, nTag, sizeof(azTag[0]), tagCmp); |
| 1208 | } |
| 1209 | |
| 1210 | /* So that older versions of Fossil (that do not understand delta- |
| 1211 | ** manifest) can continue to use this repository, do not create a new |
| 1212 | ** delta-manifest unless this repository already contains one or more |
| 1213 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1143,11 +1143,10 @@ | |
| 1143 | int testRun; /* True for a test run. Debugging only */ |
| 1144 | CheckinInfo sCiInfo; /* Information about this check-in */ |
| 1145 | const char *zComFile; /* Read commit message from this file */ |
| 1146 | int nTag = 0; /* Number of --tag arguments */ |
| 1147 | const char *zTag; /* A single --tag argument */ |
| 1148 | Blob manifest; /* Manifest in baseline form */ |
| 1149 | Blob muuid; /* Manifest uuid */ |
| 1150 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1151 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1152 | int szD; /* Size of the delta manifest */ |
| @@ -1201,12 +1200,12 @@ | |
| 1200 | verify_all_options(); |
| 1201 | |
| 1202 | /* Escape special characters in tags and put all tags in sorted order */ |
| 1203 | if( nTag ){ |
| 1204 | int i; |
| 1205 | for(i=0; i<nTag; i++) sCiInfo.azTag[i] = mprintf("%F", sCiInfo.azTag[i]); |
| 1206 | qsort((void*)sCiInfo.azTag, nTag, sizeof(sCiInfo.azTag[0]), tagCmp); |
| 1207 | } |
| 1208 | |
| 1209 | /* So that older versions of Fossil (that do not understand delta- |
| 1210 | ** manifest) can continue to use this repository, do not create a new |
| 1211 | ** delta-manifest unless this repository already contains one or more |
| 1212 |