Fossil SCM
Fix a bug in the Git import routine.
Commit
9c31866404f1c09e61fa19adf2d7f3cc3abc56d4
Parent
80c42a33128ff26…
1 file changed
+3
-1
+3
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -199,11 +199,13 @@ | ||
| 199 | 199 | qsort(gg.aFile, gg.nFile, sizeof(gg.aFile[0]), mfile_cmp); |
| 200 | 200 | blob_zero(&record); |
| 201 | 201 | blob_appendf(&record, "C %F\n", gg.zComment); |
| 202 | 202 | blob_appendf(&record, "D %s\n", gg.zDate); |
| 203 | 203 | for(i=0; i<gg.nFile; i++){ |
| 204 | - blob_appendf(&record, "F %F %s", gg.aFile[i].zName, gg.aFile[i].zUuid); | |
| 204 | + const char *zUuid = gg.aFile[i].zUuid; | |
| 205 | + if( zUuid==0 ) continue; | |
| 206 | + blob_appendf(&record, "F %F %s", gg.aFile[i].zName, zUuid); | |
| 205 | 207 | if( gg.aFile[i].isExe ){ |
| 206 | 208 | blob_append(&record, " x\n", 3); |
| 207 | 209 | }else{ |
| 208 | 210 | blob_append(&record, "\n", 1); |
| 209 | 211 | } |
| 210 | 212 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -199,11 +199,13 @@ | |
| 199 | qsort(gg.aFile, gg.nFile, sizeof(gg.aFile[0]), mfile_cmp); |
| 200 | blob_zero(&record); |
| 201 | blob_appendf(&record, "C %F\n", gg.zComment); |
| 202 | blob_appendf(&record, "D %s\n", gg.zDate); |
| 203 | for(i=0; i<gg.nFile; i++){ |
| 204 | blob_appendf(&record, "F %F %s", gg.aFile[i].zName, gg.aFile[i].zUuid); |
| 205 | if( gg.aFile[i].isExe ){ |
| 206 | blob_append(&record, " x\n", 3); |
| 207 | }else{ |
| 208 | blob_append(&record, "\n", 1); |
| 209 | } |
| 210 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -199,11 +199,13 @@ | |
| 199 | qsort(gg.aFile, gg.nFile, sizeof(gg.aFile[0]), mfile_cmp); |
| 200 | blob_zero(&record); |
| 201 | blob_appendf(&record, "C %F\n", gg.zComment); |
| 202 | blob_appendf(&record, "D %s\n", gg.zDate); |
| 203 | for(i=0; i<gg.nFile; i++){ |
| 204 | const char *zUuid = gg.aFile[i].zUuid; |
| 205 | if( zUuid==0 ) continue; |
| 206 | blob_appendf(&record, "F %F %s", gg.aFile[i].zName, zUuid); |
| 207 | if( gg.aFile[i].isExe ){ |
| 208 | blob_append(&record, " x\n", 3); |
| 209 | }else{ |
| 210 | blob_append(&record, "\n", 1); |
| 211 | } |
| 212 |