diff options
| author | David Turner <novalis@novalis.org> | 2019-01-17 23:19:43 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-18 15:22:02 -0800 |
| commit | d1dd94b308607d0a37aa8a013fd20678956d3531 (patch) | |
| tree | 76941b07caff798b7e8b45c05d7c88075b087f63 /Documentation/git-cat-file.txt | |
| parent | 16a465bc018d09e9d7bbbdc5f40a7fb99c21f8ef (diff) | |
| download | git-d1dd94b308607d0a37aa8a013fd20678956d3531.tar.gz | |
Do not print 'dangling' for cat-file in case of ambiguity
The return values -1 and -2 from get_oid could mean two different
things, depending on whether they were from an enum returned by
get_tree_entry_follow_symlinks, or from a different code path. This
caused 'dangling' to be printed from a git cat-file in the case of an
ambiguous (-2) result.
Unify the results of get_oid* and get_tree_entry_follow_symlinks to be
one common type, with unambiguous values.
Signed-off-by: David Turner <novalis@novalis.org>
Reported-by: Eric Wong <e@80x24.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-cat-file.txt')
| -rw-r--r-- | Documentation/git-cat-file.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt index 74013335a1..e27a940985 100644 --- a/Documentation/git-cat-file.txt +++ b/Documentation/git-cat-file.txt @@ -252,6 +252,12 @@ the repository, then `cat-file` will ignore any custom format and print: <object> SP missing LF ------------ +If a name is specified that might refer to more than one object (an ambiguous short sha), then `cat-file` will ignore any custom format and print: + +------------ +<object> SP ambiguous LF +------------ + If --follow-symlinks is used, and a symlink in the repository points outside the repository, then `cat-file` will ignore any custom format and print: |