From 255b78ff5291cef79978b025c9872f801de89e23 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
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 <mail@eworm.de>
Reviewed-by: John Keeping <john@keeping.me.uk>
---
 git | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'git')

diff --git a/git b/git
index fc54c1a..53f9a3e 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit fc54c1af3ec09bab8b8ea09768c2da4069b7f53e
+Subproject commit 53f9a3e157dbbc901a02ac2c73346d375e24978c
-- 
cgit v1.2.3