Merge branch 'bc/tree-walk-oid'
authorJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:56 +0000 (12:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 29 Jan 2019 20:47:56 +0000 (12:47 -0800)
commit371820d5f1bb3c3e691ad21cee652c02c36ea758
treead479bc8fd4e4c59c93807fe47355ef6fccf68e5
parenta6e3839976ed6328fccc83848c4f7c59d301edee
parent974e4a85e354d07fb4d50ff908713ecd5bcd4fff
Merge branch 'bc/tree-walk-oid'

The code to walk tree objects has been taught that we may be
working with object names that are not computed with SHA-1.

* bc/tree-walk-oid:
  cache: make oidcpy always copy GIT_MAX_RAWSZ bytes
  tree-walk: store object_id in a separate member
  match-trees: use hashcpy to splice trees
  match-trees: compute buffer offset correctly when splicing
  tree-walk: copy object ID before use
13 files changed:
builtin/grep.c
builtin/merge-tree.c
builtin/pack-objects.c
cache-tree.c
cache.h
list-objects.c
packfile.c
revision.c
tree-diff.c
tree-walk.c
tree-walk.h
tree.c
unpack-trees.c