From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: git@vger.kernel.org
Cc: "Junio C Hamano" <gitster@pobox.com>,
"H . Peter Anvin" <hpa@zytor.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: [PATCH 2/2] cat-file: -e should not emit output on stderr
Date: Wed, 10 Jan 2018 12:55:54 +0000 [thread overview]
Message-ID: <20180110125554.12582-3-avarab@gmail.com> (raw)
In-Reply-To: <20180110125554.12582-1-avarab@gmail.com>
Change "cat-file -e some-garbage" to work as documented. Before it
would emit:
$ git cat-file -e some-garbage; echo $?
fatal: Not a valid object name some-garbage
128
Now:
$ ./git-cat-file -e some-garbage; echo $?
1
This is a change to longstanding behavior established in
7950571ad7 ("A few more options for git-cat-file", 2005-12-03) when
the option was initially added, but we should go with the promise made
in the documentation.
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
builtin/cat-file.c | 8 ++++++--
t/t1006-cat-file.sh | 7 +++++++
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index f5fa4fd75a..75991788af 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -65,8 +65,12 @@ static int cat_one_file(int opt, const char *exp_type, const char *obj_name,
flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
- &oid, &obj_context))
- die("Not a valid object name %s", obj_name);
+ &oid, &obj_context)) {
+ if (opt == 'e')
+ return 1;
+ else
+ die("Not hello a valid object name %s", obj_name);
+ }
if (!path)
path = obj_context.path;
diff --git a/t/t1006-cat-file.sh b/t/t1006-cat-file.sh
index b19f332694..c05a899bc4 100755
--- a/t/t1006-cat-file.sh
+++ b/t/t1006-cat-file.sh
@@ -201,6 +201,13 @@ do
'
done
+test_expect_success 'Providing -e should suppress all error output' '
+ ! git cat-file -e some-garbage >stdout 2>stderr &&
+ >expect &&
+ test_cmp expect stdout &&
+ test_cmp expect stderr
+'
+
for opt in t s e p
do
test_expect_success "Passing -$opt with --follow-symlinks fails" '
--
2.15.1.424.g9478a66081
next prev parent reply other threads:[~2018-01-10 12:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-10 12:55 [PATCH 0/2] the cat-file -e option doesn't work as documented Ævar Arnfjörð Bjarmason
2018-01-10 12:55 ` [PATCH 1/2] cat-file doc: document that -e will return some output Ævar Arnfjörð Bjarmason
2018-01-10 21:38 ` Junio C Hamano
2018-01-10 22:09 ` Junio C Hamano
2018-01-10 12:55 ` Ævar Arnfjörð Bjarmason [this message]
2018-01-10 20:43 ` [PATCH 0/2] the cat-file -e option doesn't work as documented Junio C Hamano
2018-01-10 20:50 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180110125554.12582-3-avarab@gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=hpa@zytor.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).