From bd1b281478c8d8ab45f723ac5818d58da4a64dd1 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 14:05:02 +0100 Subject: ui-shared: pass repo object to print_snapshot_links() Both call sites of cgit_print_snapshot_links() use the same values for the snapshot mask and repository name, which are derived from the cgit_repo structure so let's pass in the structure and access the fields directly. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-commit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index abf58f6..ea17461 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -110,8 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix) } if (ctx.repo->snapshots) { html("download"); - cgit_print_snapshot_links(ctx.qry.repo, ctx.qry.head, - hex, ctx.repo->snapshots); + cgit_print_snapshot_links(ctx.repo, ctx.qry.head, hex); html(""); } html("\n"); -- cgit v1.2.3-24-g4f1b From 63da41a915157d27dcf26e4811bd6b5f8a3abb2b Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:02:21 +0100 Subject: ui-shared: remove unused parameter The "head" parameter to cgit_print_snapshot_links() is never used, so remove it. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index ea17461..37c7d8d 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix) } if (ctx.repo->snapshots) { html("download"); - cgit_print_snapshot_links(ctx.repo, ctx.qry.head, hex); + cgit_print_snapshot_links(ctx.repo, hex); html(""); } html("\n"); -- cgit v1.2.3-24-g4f1b From e491eaa5df3055dc419d9d3cb75421e8a8c43944 Mon Sep 17 00:00:00 2001 From: John Keeping Date: Sat, 31 Mar 2018 15:08:59 +0100 Subject: ui-shared: pass separator in to cgit_print_snapshot_links() cgit_print_snapshot_links() is almost identical to print_tag_downloads(), so let's extract the difference to a parameter in preparation for removing print_tag_downloads() in the next commit. Signed-off-by: John Keeping Reviewed-by: Christian Hesse --- ui-commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index 37c7d8d..65b4603 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -110,7 +110,7 @@ void cgit_print_commit(char *hex, const char *prefix) } if (ctx.repo->snapshots) { html("download"); - cgit_print_snapshot_links(ctx.repo, hex); + cgit_print_snapshot_links(ctx.repo, hex, "
"); html(""); } html("\n"); -- cgit v1.2.3-24-g4f1b From 255b78ff5291cef79978b025c9872f801de89e23 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 4 Jun 2018 18:49:28 +0200 Subject: git: update to v2.18.0 Update to git version v2.18.0. Required changes follow upstream commits: * Convert find_unique_abbrev* to struct object_id (aab9583f7b5ea5463eb3f653a0b4ecac7539dc94) * sha1_file: convert read_sha1_file to struct object_id (b4f5aca40e6f77cbabcbf4ff003c3cf30a1830c8) * sha1_file: convert sha1_object_info* to object_id (abef9020e3df87c441c9a3a95f592fce5fa49bb9) * object-store: move packed_git and packed_git_mru to object store (a80d72db2a73174b3f22142eb2014b33696fd795) * treewide: rename tree to maybe_tree (891435d55da80ca3654b19834481205be6bdfe33) The changed data types required some of our own functions to be converted to struct object_id: ls_item print_dir print_dir_entry print_object single_tree_cb walk_tree write_tree_link And finally we use new upstream functions that were added for struct object_id: hashcpy -> oidcpy sha1_to_hex -> oid_to_hex Signed-off-by: Christian Hesse Reviewed-by: John Keeping --- ui-commit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ui-commit.c') diff --git a/ui-commit.c b/ui-commit.c index 65b4603..995cb93 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -78,7 +78,7 @@ void cgit_print_commit(char *hex, const char *prefix) html(")\n"); html("tree"); tmp = xstrdup(hex); - cgit_tree_link(oid_to_hex(&commit->tree->object.oid), NULL, NULL, + cgit_tree_link(oid_to_hex(&commit->maybe_tree->object.oid), NULL, NULL, ctx.qry.head, tmp, NULL); if (prefix) { html(" /"); -- cgit v1.2.3-24-g4f1b