From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 23 Jan 2018 21:16:41 +0000 (-0800)
Subject: Merge branch 'ab/doc-cat-file-e-still-shows-errors'
X-Git-Tag: v2.17.0-rc0~138
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/93a622f4a73f9dd5277d32c5ecce534bdbc40a1b?hp=3e25b6c66b08485d23a79881efb0ba24b73e81f1

Merge branch 'ab/doc-cat-file-e-still-shows-errors'

Doc update.

* ab/doc-cat-file-e-still-shows-errors:
cat-file doc: document that -e will return some output
---

diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index fb09cd69d6..f90f09b03f 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -42,8 +42,9 @@ OPTIONS
 	<object>.
 
 -e::
-	Suppress all output; instead exit with zero status if <object>
-	exists and is a valid object.
+	Exit with zero status if <object> exists and is a valid
+	object. If <object> is of an invalid format exit with non-zero and
+	emits an error on stderr.
 
 -p::
 	Pretty-print the contents of <object> based on its type.
@@ -168,7 +169,7 @@ If `-t` is specified, one of the <type>.
 
 If `-s` is specified, the size of the <object> in bytes.
 
-If `-e` is specified, no output.
+If `-e` is specified, no output, unless the <object> is malformed.
 
 If `-p` is specified, the contents of <object> are pretty-printed.