Merge branch 'bc/object-id'
commit42c8ce1c49f862c98b35e4d89c88aa3d489d6608
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:10 +0000 (30 14:04 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 05:04:10 +0000 (30 14:04 +0900)
treedce3eb119c51e3d539f5a703411787d3a333b175
parent3d241297991c6f6ac6b1e50e52a4ae35bc431f28
parent7882fa220c1f86e3f9707270e2e94d54149394ed
Merge branch 'bc/object-id'

Conversion from uchar[20] to struct object_id continues.

* bc/object-id: (42 commits)
  merge-one-file: compute empty blob object ID
  add--interactive: compute the empty tree value
  Update shell scripts to compute empty tree object ID
  sha1_file: only expose empty object constants through git_hash_algo
  dir: use the_hash_algo for empty blob object ID
  sequencer: use the_hash_algo for empty tree object ID
  cache-tree: use is_empty_tree_oid
  sha1_file: convert cached object code to struct object_id
  builtin/reset: convert use of EMPTY_TREE_SHA1_BIN
  builtin/receive-pack: convert one use of EMPTY_TREE_SHA1_HEX
  wt-status: convert two uses of EMPTY_TREE_SHA1_HEX
  submodule: convert several uses of EMPTY_TREE_SHA1_HEX
  sequencer: convert one use of EMPTY_TREE_SHA1_HEX
  merge: convert empty tree constant to the_hash_algo
  builtin/merge: switch tree functions to use object_id
  builtin/am: convert uses of EMPTY_TREE_SHA1_BIN to the_hash_algo
  sha1-file: add functions for hex empty tree and blob OIDs
  builtin/receive-pack: avoid hard-coded constants for push certs
  diff: specify abbreviation size in terms of the_hash_algo
  upload-pack: replace use of several hard-coded constants
  ...
27 files changed:
builtin/am.c
builtin/fsck.c
builtin/index-pack.c
builtin/merge.c
builtin/pack-objects.c
builtin/receive-pack.c
cache.h
commit.c
diff.c
dir.c
dir.h
fsck.c
git-rebase--interactive.sh
http.c
packfile.c
packfile.h
read-cache.c
revision.c
sequencer.c
sha1-file.c
sha1-name.c
submodule-config.c
submodule-config.h
submodule.c
unpack-trees.c
upload-pack.c
wt-status.c