about summary refs log tree commit diff stats
path: root/ui-diff.c
diff options
context:
space:
mode:
authorChristian Hesse2018-08-28 18:27:00 +0200
committerChristian Hesse2018-10-12 23:06:02 +0200
commit2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005 (patch)
tree283e8808868837a7156dc9f1b745a978ba6f2bf0 /ui-diff.c
parentui-ssdiff: ban strcat() (diff)
downloadcgit-2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005.tar.gz
cgit-2c9f56f3e1c754f60ccffbc6c745b9d5a81ea005.zip
git: update to v2.19.1
Update to git version v2.19.1. Required changes follow upstream commits:

* commit: add repository argument to get_cached_commit_buffer
  (3ce85f7e5a41116145179f0fae2ce6d86558d099)

* commit: add repository argument to lookup_commit_reference
  (2122f6754c93be8f02bfb5704ed96c88fc9837a8)

* object: add repository argument to parse_object
  (109cd76dd3467bd05f8d2145b857006649741d5c)

* tag: add repository argument to deref_tag
  (a74093da5ed601a09fa158e5ba6f6f14c1142a3e)

* tag: add repository argument to lookup_tag
  (ce71efb713f97f476a2d2ab541a0c73f684a5db3)

* tree: add repository argument to lookup_tree
  (f86bcc7b2ce6cad68ba1a48a528e380c6126705e)

* archive.c: avoid access to the_index
  (b612ee202a48f129f81f8f6a5af6cf71d1a9caef)

* for_each_*_object: move declarations to object-store.h
  (0889aae1cd18c1804ba01c1a4229e516dfb9fe9b)

Signed-off-by: Christian Hesse <mail@eworm.de>
Diffstat (limited to 'ui-diff.c')
-rw-r--r--ui-diff.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui-diff.c b/ui-diff.c index e33e9fb..70dcc91 100644 --- a/ui-diff.c +++ b/ui-diff.c
@@ -407,7 +407,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
407 "Bad object name: %s", new_rev); 407 "Bad object name: %s", new_rev);
408 return; 408 return;
409 } 409 }
410 commit = lookup_commit_reference(new_rev_oid); 410 commit = lookup_commit_reference(the_repository, new_rev_oid);
411 if (!commit || parse_commit(commit)) { 411 if (!commit || parse_commit(commit)) {
412 cgit_print_error_page(404, "Not found", 412 cgit_print_error_page(404, "Not found",
413 "Bad commit: %s", oid_to_hex(new_rev_oid)); 413 "Bad commit: %s", oid_to_hex(new_rev_oid));
@@ -428,7 +428,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev,
428 } 428 }
429 429
430 if (!is_null_oid(old_rev_oid)) { 430 if (!is_null_oid(old_rev_oid)) {
431 commit2 = lookup_commit_reference(old_rev_oid); 431 commit2 = lookup_commit_reference(the_repository, old_rev_oid);
432 if (!commit2 || parse_commit(commit2)) { 432 if (!commit2 || parse_commit(commit2)) {
433 cgit_print_error_page(404, "Not found", 433 cgit_print_error_page(404, "Not found",
434 "Bad commit: %s", oid_to_hex(old_rev_oid)); 434 "Bad commit: %s", oid_to_hex(old_rev_oid));