Fossil

Check-in [bad4d282]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:missing hyphens
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: bad4d282977cd57d88c19b4e049b9bedf34a32ddc95ce39e4312c0151eca4557
User & Date: jan.nijtmans 2018-01-16 09:09:06.502
Context
2018-01-16
14:01
Fix typo in the default skin CSS - patch from Johan Kuuse. ... (check-in: e07fdbc5 user: drh tags: trunk)
09:09
missing hyphens ... (check-in: bad4d282 user: jan.nijtmans tags: trunk)
08:34
Fix recognition of sha3 in marks file. Patch adapted from Dingyuan Wang's report. Thanks! ... (check-in: 90b07ed5 user: jan.nijtmans tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/export.c.
︙︙
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

** struct mark_t
**   holds information for translating between git commits
**   and fossil commits.
**   -git_name: This is the mark name that identifies the commit to git.
**              It will always begin with a ':'.
**   -rid: The unique object ID that identifies this commit within the
**         repository database.
**   -uuid: The SHA-1/SHA3 of artifact corresponding to rid.
*/
struct mark_t{
  char *name;
  int rid;
  char uuid[65];
};
#endif








|








33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

** struct mark_t
**   holds information for translating between git commits
**   and fossil commits.
**   -git_name: This is the mark name that identifies the commit to git.
**              It will always begin with a ':'.
**   -rid: The unique object ID that identifies this commit within the
**         repository database.
**   -uuid: The SHA-1/SHA-3 of artifact corresponding to rid.
*/
struct mark_t{
  char *name;
  int rid;
  char uuid[65];
};
#endif
︙︙
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363

  }else{
    sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", cur_tok);
  }

  /* make sure that rid corresponds to UUID */
  if( fast_uuid_to_rid(mark->uuid)!=mark->rid ){
    free(mark->name);
    fossil_trace("Non-existent SHA-1/SHA3 in marks file: %s\n", mark->uuid);
    return -1;
  }

  /* insert a cross-ref into the 'xmark' table */
  insert_commit_xref(mark->rid, mark->name, mark->uuid);
  return 0;
}








|








349
350
351
352
353
354
355
356
357
358
359
360
361
362
363

  }else{
    sqlite3_snprintf(sizeof(mark->uuid), mark->uuid, "%s", cur_tok);
  }

  /* make sure that rid corresponds to UUID */
  if( fast_uuid_to_rid(mark->uuid)!=mark->rid ){
    free(mark->name);
    fossil_trace("Non-existent SHA-1/SHA-3 in marks file: %s\n", mark->uuid);
    return -1;
  }

  /* insert a cross-ref into the 'xmark' table */
  insert_commit_xref(mark->rid, mark->name, mark->uuid);
  return 0;
}
︙︙