From: Junio C Hamano Date: Fri, 10 Jan 2014 18:32:10 +0000 (-0800) Subject: Merge branch 'cc/replace-object-info' X-Git-Tag: v1.9-rc0~41 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b0504a95193504b9d37ef8f01b5b2403e345ee89 Merge branch 'cc/replace-object-info' read_sha1_file() that is the workhorse to read the contents given an object name honoured object replacements, but there is no corresponding mechanism to sha1_object_info() that is used to obtain the metainfo (e.g. type & size) about the object, leading callers to weird inconsistencies. * cc/replace-object-info: replace info: rename 'full' to 'long' and clarify in-code symbols Documentation/git-replace: describe --format option builtin/replace: unset read_replace_refs t6050: add tests for listing with --format builtin/replace: teach listing using short, medium or full formats sha1_file: perform object replacement in sha1_object_info_extended() t6050: show that git cat-file --batch fails with replace objects sha1_object_info_extended(): add an "unsigned flags" parameter sha1_file.c: add lookup_replace_object_extended() to pass flags replace_object: don't check read_replace_refs twice rename READ_SHA1_FILE_REPLACE flag to LOOKUP_REPLACE_OBJECT --- b0504a95193504b9d37ef8f01b5b2403e345ee89