From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 May 2015 04:00:23 +0000 (-0700)
Subject: Merge branch 'bc/object-id'
X-Git-Tag: v2.5.0-rc0~161
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=a916cb5fb4824322d7e99b1b0efad4e6d7850e78;p=git.git

Merge branch 'bc/object-id'

Identify parts of the code that knows that we use SHA-1 hash to
name our objects too much, and use (1) symbolic constants instead
of hardcoded 20 as byte count and/or (2) use struct object_id
instead of unsigned char [20] for object names.

* bc/object-id:
  apply: convert threeway_stage to object_id
  patch-id: convert to use struct object_id
  commit: convert parts to struct object_id
  diff: convert struct combine_diff_path to object_id
  bulk-checkin.c: convert to use struct object_id
  zip: use GIT_SHA1_HEXSZ for trailers
  archive.c: convert to use struct object_id
  bisect.c: convert leaf functions to use struct object_id
  define utility functions for object IDs
  define a structure for object IDs
---

a916cb5fb4824322d7e99b1b0efad4e6d7850e78