[PATCH 1/2] fsck_commit_buffer(): do not special case the last validation
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Apr 14, 2016, 18:07 UTC
- Message-ID
- <20160414180709.28968-1-gitster@pobox.com>
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