From: Thomas Rast <trast@inf.ethz.ch>
To: <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Ramkumar Ramachandra" <artagnon@gmail.com>,
"Alex Bennée" <kernel-hacker@bennee.com>,
"Antoine Pelisse" <apelisse@gmail.com>,
"John Keeping" <john@keeping.me.uk>,
"Nguyễn Thái Ngọc Duy" <pclouds@gmail.com>
Subject: [PATCH 1/2] sha1_file: silence sha1_loose_object_info
Date: Thu, 30 May 2013 22:00:22 +0200 [thread overview]
Message-ID: <2d926e4dbd218b2305f50652c00a5c1d87e81208.1369943791.git.trast@inf.ethz.ch> (raw)
In-Reply-To: <87bo7sbeoc.fsf@linux-k42r.v.cablecom.net>
sha1_object_info() returns -1 (OBJ_BAD) if it cannot find the object
for some reason, which suggests that it wants the _caller_ to report
this error. However, part of its work happens in
sha1_loose_object_info, which _does_ report errors itself. This is
doubly strange because:
* packed_object_info(), which is the other half of the duo, does _not_
report this.
* In the event that an object is packed and pruned while
sha1_object_info_extended() goes looking for it, we would
erroneously show the error -- even though the code of the latter
function purports to handle this case gracefully.
* A caller might invoke sha1_object_info() to find the type of an
object even if that object is not known to exist.
Silence this error. The others remain untouched as a corrupt object
is a much more grave error than it merely being absent.
Signed-off-by: Thomas Rast <trast@inf.ethz.ch>
---
sha1_file.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sha1_file.c b/sha1_file.c
index 67e815b..c0f6a0e 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -2348,7 +2348,7 @@ static int sha1_loose_object_info(const unsigned char *sha1, unsigned long *size
map = map_sha1_file(sha1, &mapsize);
if (!map)
- return error("unable to find %s", sha1_to_hex(sha1));
+ return -1;
if (unpack_sha1_header(&stream, map, mapsize, hdr, sizeof(hdr)) < 0)
status = error("unable to unpack %s header",
sha1_to_hex(sha1));
--
1.8.3.506.g4fdeee5
next prev parent reply other threads:[~2013-05-30 20:00 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 10:38 Poor performance of git describe in big repos Alex Bennée
2013-05-30 11:33 ` Ramkumar Ramachandra
2013-05-30 13:09 ` Alex Bennée
2013-05-30 14:32 ` Ramkumar Ramachandra
2013-05-30 15:01 ` Alex Bennée
2013-05-30 15:17 ` Ramkumar Ramachandra
2013-05-30 15:33 ` Thomas Rast
2013-05-30 16:01 ` Alex Bennée
2013-05-30 16:21 ` Thomas Rast
2013-05-30 16:44 ` Thomas Rast
2013-05-30 19:01 ` Antoine Pelisse
2013-05-30 20:00 ` Thomas Rast [this message]
2013-05-30 20:00 ` [PATCH 2/2] lookup_commit_reference_gently: do not read non-{tag,commit} Thomas Rast
2013-05-30 21:22 ` Jeff King
2013-05-31 0:52 ` Duy Nguyen
2013-05-31 8:08 ` Thomas Rast
2013-05-31 16:00 ` Jeff King
2013-05-31 6:43 ` Ramkumar Ramachandra
2013-05-31 8:16 ` Thomas Rast
2013-05-30 19:30 ` Poor performance of git describe in big repos John Keeping
2013-05-31 8:14 ` Alex Bennée
2013-05-31 8:24 ` Thomas Rast
2013-05-31 8:40 ` Alex Bennée
2013-05-31 8:46 ` Thomas Rast
2013-05-31 9:57 ` Alex Bennée
2013-06-03 8:02 ` Alex Bennée
2013-06-03 16:32 ` Junio C Hamano
2013-06-03 17:48 ` Junio C Hamano
2013-05-31 10:27 ` Thomas Rast
2013-05-31 16:17 ` Jeff King
2013-06-03 8:39 ` Alex Bennée
2013-06-03 14:49 ` Jeff King
2013-05-31 8:32 ` John Keeping
2013-05-31 8:49 ` Alex Bennée
2013-05-31 8:59 ` John Keeping
2013-05-30 11:48 ` John Keeping
2013-05-30 12:29 ` Alex Bennée
2013-05-30 13:20 ` Duy Nguyen
[not found] ` <CAJ-05NPacjAEC99Ntd9eMnTD9_PMMYFob-_tAx5CeSB79TkRSg@mail.gmail.com>
2013-05-30 13:45 ` Duy Nguyen
2013-05-30 14:02 ` Alex Bennée
2013-05-30 13:16 ` Alex Bennée
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=2d926e4dbd218b2305f50652c00a5c1d87e81208.1369943791.git.trast@inf.ethz.ch \
--to=trast@inf.ethz.ch \
--cc=apelisse@gmail.com \
--cc=artagnon@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=john@keeping.me.uk \
--cc=kernel-hacker@bennee.com \
--cc=pclouds@gmail.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).