From: Jeff King <peff@peff.net>
Date: Sun, 13 May 2018 16:35:37 +0000 (-0400)
Subject: fsck: simplify ".git" check
X-Git-Tag: v2.17.1~1^2~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ed9c3220621d634d543bc4dd998d12167dfc57d4?hp=--cc

fsck: simplify ".git" check

There's no need for us to manually check for ".git"; it's a
subset of the other filesystem-specific tests. Dropping it
makes our code slightly shorter. More importantly, the
existing code may make a reader wonder why ".GIT" is not
covered here, and whether that is a bug (it isn't, as it's
also covered in the filesystem-specific tests).

Signed-off-by: Jeff King <peff@peff.net>
---

ed9c3220621d634d543bc4dd998d12167dfc57d4
diff --git a/fsck.c b/fsck.c
index 5c8c12dde3..f7be966bde 100644
--- a/fsck.c
+++ b/fsck.c
@@ -561,9 +561,7 @@ static int fsck_tree(struct tree *item, struct fsck_options *options)
 		has_empty_name |= !*name;
 		has_dot |= !strcmp(name, ".");
 		has_dotdot |= !strcmp(name, "..");
-		has_dotgit |= (!strcmp(name, ".git") ||
-			       is_hfs_dotgit(name) ||
-			       is_ntfs_dotgit(name));
+		has_dotgit |= is_hfs_dotgit(name) || is_ntfs_dotgit(name);
 		has_zero_pad |= *(char *)desc.buffer == '0';
 		if (update_tree_entry_gently(&desc)) {
 			retval += report(options, &item->object, FSCK_MSG_BAD_TREE, "cannot be parsed as a tree");