Fossil SCM
When importing a git fast-import, we silently change master branch to trunk to match the default fossil naming conventions. So when we export to the git fast-import format, we should silently change the trunk branch back into master to match the git naming conventions.
Commit
01231dcb5e1bec7125c0211159bd0370e383bdbe
Parent
abc87ccdd5aac7b…
1 file changed
+2
-1
+2
-1
| --- src/export.c | ||
| +++ src/export.c | ||
| @@ -611,11 +611,12 @@ | ||
| 611 | 611 | |
| 612 | 612 | bag_insert(&vers, ckinId); |
| 613 | 613 | db_bind_int(&q2, ":rid", ckinId); |
| 614 | 614 | db_step(&q2); |
| 615 | 615 | db_reset(&q2); |
| 616 | - if( zBranch==0 ) zBranch = "trunk"; | |
| 616 | + /* fossil trunk is git master. */ | |
| 617 | + if( zBranch==0 || fossil_strcmp(zBranch, "trunk") == 0 ) zBranch = "master"; | |
| 617 | 618 | zMark = mark_name_from_rid(ckinId, &unused_mark); |
| 618 | 619 | printf("commit refs/heads/"); |
| 619 | 620 | print_ref(zBranch); |
| 620 | 621 | printf("\nmark %s\n", zMark); |
| 621 | 622 | free(zMark); |
| 622 | 623 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -611,11 +611,12 @@ | |
| 611 | |
| 612 | bag_insert(&vers, ckinId); |
| 613 | db_bind_int(&q2, ":rid", ckinId); |
| 614 | db_step(&q2); |
| 615 | db_reset(&q2); |
| 616 | if( zBranch==0 ) zBranch = "trunk"; |
| 617 | zMark = mark_name_from_rid(ckinId, &unused_mark); |
| 618 | printf("commit refs/heads/"); |
| 619 | print_ref(zBranch); |
| 620 | printf("\nmark %s\n", zMark); |
| 621 | free(zMark); |
| 622 |
| --- src/export.c | |
| +++ src/export.c | |
| @@ -611,11 +611,12 @@ | |
| 611 | |
| 612 | bag_insert(&vers, ckinId); |
| 613 | db_bind_int(&q2, ":rid", ckinId); |
| 614 | db_step(&q2); |
| 615 | db_reset(&q2); |
| 616 | /* fossil trunk is git master. */ |
| 617 | if( zBranch==0 || fossil_strcmp(zBranch, "trunk") == 0 ) zBranch = "master"; |
| 618 | zMark = mark_name_from_rid(ckinId, &unused_mark); |
| 619 | printf("commit refs/heads/"); |
| 620 | print_ref(zBranch); |
| 621 | printf("\nmark %s\n", zMark); |
| 622 | free(zMark); |
| 623 |