| From b2018d76715ff8cbb7f913a22c4bc6891f9b490c Mon Sep 17 00:00:00 2001 |
| From: Jeff King <peff@peff.net> |
| Date: Sun, 13 May 2018 12:35:37 -0400 |
| Subject: fsck: simplify ".git" check |
| |
| commit ed9c3220621d634d543bc4dd998d12167dfc57d4 upstream. |
| |
| 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> |
| Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> |
| --- |
| fsck.c | 4 +--- |
| 1 file changed, 1 insertion(+), 3 deletions(-) |
| |
| diff --git a/fsck.c b/fsck.c |
| index 4a3069e204..1336ead9eb 100644 |
| --- a/fsck.c |
| +++ b/fsck.c |
| @@ -556,9 +556,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"); |
| -- |
| 2.17.0.921.gf22659ad46 |
| |
