Fossil

Differences From Artifact [6f2d75f340]:

• File src/export.c — part of check-in [abc87ccdd5] at 2017-02-10 01:25:23 on branch roy-export — Add function print_ref to sanitize branch and tag names in accordance with https://git-scm.com/docs/git-check-ref-format Use this rather than simply replacing non alpha or numeric chars for branch and tag names when exporting. (user: roy.marples size: 22073)

To Artifact [5ecf7abdfa]:

• File src/export.c — part of check-in [01231dcb5e] at 2017-02-10 01:44:45 on branch roy-export — 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. (user: roy.marples size: 22152)

609
610
611
612
613
614
615

616

617
618
619
620
621
622
623

609
610
611
612
613
614
615
616

617
618
619
620
621
622
623
624

+
-
+

    const char *zBranch = db_column_text(&q, 4);
    char *zMark;

    bag_insert(&vers, ckinId);
    db_bind_int(&q2, ":rid", ckinId);
    db_step(&q2);
    db_reset(&q2);
    /* fossil trunk is git master. */
    if( zBranch==0 ) zBranch = "trunk";
    if( zBranch==0 || fossil_strcmp(zBranch, "trunk") == 0 ) zBranch = "master";
    zMark = mark_name_from_rid(ckinId, &unused_mark);
    printf("commit refs/heads/");
    print_ref(zBranch);
    printf("\nmark %s\n", zMark);
    free(zMark);
    printf("committer");
    print_person(zUser);