Fossil SCM
Fix a bug in processing of "merge" records for "fossil import".
Commit
6b76effa924709a905a9f45e90d0b5339f6fc93a
Parent
b2f637510a69c2a…
1 file changed
+1
-1
+1
-1
| --- src/import.c | ||
| +++ src/import.c | ||
| @@ -449,11 +449,11 @@ | ||
| 449 | 449 | trim_newline(&zLine[6]); |
| 450 | 450 | if( gg.nMerge>=gg.nMergeAlloc ){ |
| 451 | 451 | gg.nMergeAlloc = gg.nMergeAlloc*2 + 10; |
| 452 | 452 | gg.azMerge = fossil_realloc(gg.azMerge, gg.nMergeAlloc*sizeof(char*)); |
| 453 | 453 | } |
| 454 | - gg.azMerge[gg.nMerge] = resolve_committish(&zLine[5]); | |
| 454 | + gg.azMerge[gg.nMerge] = resolve_committish(&zLine[6]); | |
| 455 | 455 | if( gg.azMerge[gg.nMerge] ) gg.nMerge++; |
| 456 | 456 | }else |
| 457 | 457 | if( memcmp(zLine, "M ", 2)==0 ){ |
| 458 | 458 | import_prior_files(); |
| 459 | 459 | z = &zLine[2]; |
| 460 | 460 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -449,11 +449,11 @@ | |
| 449 | trim_newline(&zLine[6]); |
| 450 | if( gg.nMerge>=gg.nMergeAlloc ){ |
| 451 | gg.nMergeAlloc = gg.nMergeAlloc*2 + 10; |
| 452 | gg.azMerge = fossil_realloc(gg.azMerge, gg.nMergeAlloc*sizeof(char*)); |
| 453 | } |
| 454 | gg.azMerge[gg.nMerge] = resolve_committish(&zLine[5]); |
| 455 | if( gg.azMerge[gg.nMerge] ) gg.nMerge++; |
| 456 | }else |
| 457 | if( memcmp(zLine, "M ", 2)==0 ){ |
| 458 | import_prior_files(); |
| 459 | z = &zLine[2]; |
| 460 |
| --- src/import.c | |
| +++ src/import.c | |
| @@ -449,11 +449,11 @@ | |
| 449 | trim_newline(&zLine[6]); |
| 450 | if( gg.nMerge>=gg.nMergeAlloc ){ |
| 451 | gg.nMergeAlloc = gg.nMergeAlloc*2 + 10; |
| 452 | gg.azMerge = fossil_realloc(gg.azMerge, gg.nMergeAlloc*sizeof(char*)); |
| 453 | } |
| 454 | gg.azMerge[gg.nMerge] = resolve_committish(&zLine[6]); |
| 455 | if( gg.azMerge[gg.nMerge] ) gg.nMerge++; |
| 456 | }else |
| 457 | if( memcmp(zLine, "M ", 2)==0 ){ |
| 458 | import_prior_files(); |
| 459 | z = &zLine[2]; |
| 460 |