diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:32:10 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-01-10 10:32:10 -0800 |
commit | b0504a95193504b9d37ef8f01b5b2403e345ee89 (patch) | |
tree | 594fc2504131dacb49fb52b110471728cc24120b /abspath.c | |
parent | 010d81ae35238c1b60144dce3fd3eba90a45b434 (diff) | |
parent | 663a8566beb5387530641abe71a8d8b2dafd08b3 (diff) | |
download | git-b0504a95193504b9d37ef8f01b5b2403e345ee89.tar.gz |
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
Diffstat (limited to 'abspath.c')
0 files changed, 0 insertions, 0 deletions