aboutsummaryrefslogtreecommitdiffstats
path: root/ui-clone.c
diff options
context:
space:
mode:
authorChristian Hesse2018-06-04 18:49:28 +0200
committerJason A. Donenfeld2018-06-27 18:13:03 +0200
commit255b78ff5291cef79978b025c9872f801de89e23 (patch)
tree7938fdb3af17e39507d282595e1591b0984cc2ec /ui-clone.c
parent54d37dc154f5308459df0a90c81dabd0245b6c17 (diff)
downloadcgit-255b78ff5291cef79978b025c9872f801de89e23.tar.gz
cgit-255b78ff5291cef79978b025c9872f801de89e23.tar.bz2
cgit-255b78ff5291cef79978b025c9872f801de89e23.zip
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 <mail@eworm.de> Reviewed-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-clone.c')
-rw-r--r--ui-clone.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui-clone.c b/ui-clone.c
index bc98980..2c1ac3d 100644
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -12,6 +12,7 @@
12#include "html.h" 12#include "html.h"
13#include "ui-shared.h" 13#include "ui-shared.h"
14#include "packfile.h" 14#include "packfile.h"
15#include "object-store.h"
15 16
16static int print_ref_info(const char *refname, const struct object_id *oid, 17static int print_ref_info(const char *refname, const struct object_id *oid,
17 int flags, void *cb_data) 18 int flags, void *cb_data)
@@ -38,8 +39,8 @@ static void print_pack_info(void)
38 ctx.page.mimetype = "text/plain"; 39 ctx.page.mimetype = "text/plain";
39 ctx.page.filename = "objects/info/packs"; 40 ctx.page.filename = "objects/info/packs";
40 cgit_print_http_headers(); 41 cgit_print_http_headers();
41 prepare_packed_git(); 42 reprepare_packed_git(the_repository);
42 for (pack = packed_git; pack; pack = pack->next) { 43 for (pack = get_packed_git(the_repository); pack; pack = pack->next) {
43 if (pack->pack_local) { 44 if (pack->pack_local) {
44 offset = strrchr(pack->pack_name, '/'); 45 offset = strrchr(pack->pack_name, '/');
45 if (offset && offset[1] != '\0') 46 if (offset && offset[1] != '\0')