about summary refs log tree commit diff stats
path: root/ui-tree.c
diff options
context:
space:
mode:
authorChristian Hesse2019-02-24 21:19:46 +0100
committerChristian Hesse2019-06-05 15:37:49 +0200
commit985fba80d06f37fdba5e72d738ce21ab5ab5a76d (patch)
treed8ce862864ac41701ef9b73c30aa842b3a267b8c /ui-tree.c
parentui-ssdiff: ban strncat() (diff)
downloadcgit-985fba80d06f37fdba5e72d738ce21ab5ab5a76d.tar.gz
cgit-985fba80d06f37fdba5e72d738ce21ab5ab5a76d.zip
git: update to v2.21.0
Update to git version v2.21.0. Required changes follow upstream commits:

* 6a7895fd8a3bd409f2b71ffc355d5142172cc2a0
  (commit: prepare free_commit_buffer and release_commit_memory for
  any repo)

* e092073d643b17c82d72cf692fbfaea9c9796f11
  (tree.c: make read_tree*() take 'struct repository *')

Signed-off-by: Christian Hesse <mail@eworm.de>
Reviewed-by: John Keeping <john@keeping.me.uk>
Diffstat (limited to 'ui-tree.c')
-rw-r--r--ui-tree.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/ui-tree.c b/ui-tree.c index 314ac52..4be89c8 100644 --- a/ui-tree.c +++ b/ui-tree.c
@@ -185,8 +185,8 @@ static void write_tree_link(const struct object_id *oid, char *name,
185 tree_ctx.name = NULL; 185 tree_ctx.name = NULL;
186 tree_ctx.count = 0; 186 tree_ctx.count = 0;
187 187
188 read_tree_recursive(tree, "", 0, 1, &paths, single_tree_cb, 188 read_tree_recursive(the_repository, tree, "", 0, 1,
189 &tree_ctx); 189 &paths, single_tree_cb, &tree_ctx);
190 190
191 if (tree_ctx.count != 1) 191 if (tree_ctx.count != 1)
192 break; 192 break;
@@ -294,7 +294,8 @@ static void ls_tree(const struct object_id *oid, const char *path, struct walk_t
294 } 294 }
295 295
296 ls_head(); 296 ls_head();
297 read_tree_recursive(tree, "", 0, 1, &paths, ls_item, walk_tree_ctx); 297 read_tree_recursive(the_repository, tree, "", 0, 1,
298 &paths, ls_item, walk_tree_ctx);
298 ls_tail(); 299 ls_tail();
299} 300}
300 301
@@ -373,7 +374,8 @@ void cgit_print_tree(const char *rev, char *path)
373 goto cleanup; 374 goto cleanup;
374 } 375 }
375 376
376 read_tree_recursive(commit->maybe_tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); 377 read_tree_recursive(the_repository, commit->maybe_tree, "", 0, 0,
378 &paths, walk_tree, &walk_tree_ctx);
377 if (walk_tree_ctx.state == 1) 379 if (walk_tree_ctx.state == 1)
378 ls_tail(); 380 ls_tail();
379 else if (walk_tree_ctx.state == 2) 381 else if (walk_tree_ctx.state == 2)