diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:21 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:21 -0800 |
| commit | cfd9167c15e7b09f3964204964a4c158108c6403 (patch) | |
| tree | 678a4051a44c8931ea469123528679e9987d0689 /Documentation/git-cat-file.txt | |
| parent | a3d41733f9dd0d638d1538b54d516fed033c165b (diff) | |
| parent | df799f5d99ac51d4fc791d546de3f936088582fc (diff) | |
| download | git-cfd9167c15e7b09f3964204964a4c158108c6403.tar.gz | |
Merge branch 'dt/cat-file-batch-ambiguous'
"git cat-file --batch" reported a dangling symbolic link by
mistake, when it wanted to report that a given name is ambiguous.
* dt/cat-file-batch-ambiguous:
t1512: test ambiguous cat-file --batch and --batch-output
Do not print 'dangling' for cat-file in case of ambiguity
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 9a2e9cdafb..8eca671b82 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: |