Commit a4c23852c6c16759785b24201b222fa5c41803c2
2020-02-14T10:25:50
gotweb: decorate only the branch's tip commit ID with "(branch)"; add XXX
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index b7615e0..8ef35b5 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -3004,6 +3004,30 @@ gw_get_commits(struct gw_trans * gw_trans, struct gw_header *header,
goto done;
for (;;) {
+ /*
+ * XXX This is gross; Some fields of 'header' change during every
+ * loop iteration, some remain constant (e.g. header->repo).
+ * We should refactor this to be able to call gw_free_header()
+ * during every loop iteration. Or perhaps do away with the
+ * appraoch of passing a struct around which contains data
+ * of various lifetimes, and instead pass globals like 'repo'
+ * around separately as done in e.g. tog(1). Any state which
+ * keeps changing with every iteration (e.g. header->id) would
+ * better stored in local variables of this function instead.
+ */
+ /* Clear fields that will be filled again by gw_get_commit. */
+ free(header->refs_str);
+ header->refs_str = NULL;
+ free(header->commit_id);
+ header->commit_id = NULL;
+ free(header->parent_id);
+ header->parent_id = NULL;
+ free(header->tree_id);
+ header->tree_id = NULL;
+ free(header->commit_msg);
+ header->commit_msg = NULL;
+
+ free(header->id); /* XXX see above comment */
error = got_commit_graph_iter_next(&header->id, graph,
header->repo, NULL, NULL);
if (error) {
@@ -3014,6 +3038,8 @@ gw_get_commits(struct gw_trans * gw_trans, struct gw_header *header,
if (header->id == NULL)
goto done;
+ if (header->commit != NULL) /* XXX see above comment */
+ got_object_commit_close(header->commit);
error = got_object_open_as_commit(&header->commit, header->repo,
header->id);
if (error)