From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 1/2] fsck_commit_buffer(): do not special case the last validation
Date: Thu, 14 Apr 2016 11:07:08 -0700 [thread overview]
Message-ID: <20160414180709.28968-1-gitster@pobox.com> (raw)
The pattern taken by all the validations in this function is:
if (notice a violation exists) {
err = report(... VIOLATION_KIND ...);
if (err)
return err;
}
where report() returns zero if specified kind of violation is set to
be ignored, and otherwise shows an error message and returns non-zero.
The last validation in the function immediately after the function
returns 0 to declare "all good" can cheat and directly return the
return value from report(), and the current code does so, i.e.
if (notice a violation exists)
return report(... VIOLATION_KIND ...);
return 0;
But that is a selfish code that declares it is the ultimate and
final form of the function, never to be enhanced later. To allow
and invite future enhancements, make the last test follow the same
pattern.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
fsck.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/fsck.c b/fsck.c
index ca4c685..21dfa5f 100644
--- a/fsck.c
+++ b/fsck.c
@@ -666,9 +666,11 @@ static int fsck_commit_buffer(struct commit *commit, const char *buffer,
err = fsck_ident(&buffer, &commit->object, options);
if (err)
return err;
- if (!commit->tree)
- return report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", sha1_to_hex(tree_sha1));
-
+ if (!commit->tree) {
+ err = report(options, &commit->object, FSCK_MSG_BAD_TREE, "could not load commit's tree %s", sha1_to_hex(tree_sha1));
+ if (err)
+ return err;
+ }
return 0;
}
--
2.8.1-355-gcea30bb
next reply other threads:[~2016-04-14 18:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-14 18:07 Junio C Hamano [this message]
2016-04-14 18:07 ` [PATCH 2/2] fsck: detect and warn a commit with embedded NUL Junio C Hamano
2016-04-14 18:21 ` Jeff King
2016-04-14 18:25 ` Junio C Hamano
2016-04-14 18:29 ` Jeff King
2016-04-14 19:04 ` Junio C Hamano
2016-04-14 18:25 ` Jeff King
2016-04-14 18:37 ` Junio C Hamano
2016-04-15 13:43 ` Johannes Schindelin
2016-04-14 18:10 ` [PATCH 1/2] fsck_commit_buffer(): do not special case the last validation Jeff King
2016-04-14 18:15 ` Junio C Hamano
2016-04-15 13:41 ` Johannes Schindelin
2016-04-15 15:06 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160414180709.28968-1-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/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.
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 NNTP newsgroup(s).