diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:40:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-05 23:40:04 -0800 |
| commit | d65d991b6543d8dcc8d10dd99a92a63693bcd54e (patch) | |
| tree | 2c6d972d6b6621fc1efd1aff7abbcd748a62c352 /fsck.c | |
| parent | Merge branch 'pf/editor-ignore-sigint' (diff) | |
| parent | fsck: warn about ".git" in trees (diff) | |
| download | tgif-d65d991b6543d8dcc8d10dd99a92a63693bcd54e.tar.xz | |
Merge branch 'jk/fsck-dot-in-trees'
* jk/fsck-dot-in-trees:
fsck: warn about ".git" in trees
fsck: warn about '.' and '..' in trees
Diffstat (limited to 'fsck.c')
| -rw-r--r-- | fsck.c | 15 |
1 files changed, 15 insertions, 0 deletions
@@ -142,6 +142,9 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) int has_null_sha1 = 0; int has_full_path = 0; int has_empty_name = 0; + int has_dot = 0; + int has_dotdot = 0; + int has_dotgit = 0; int has_zero_pad = 0; int has_bad_modes = 0; int has_dup_entries = 0; @@ -168,6 +171,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) has_full_path = 1; if (!*name) has_empty_name = 1; + if (!strcmp(name, ".")) + has_dot = 1; + if (!strcmp(name, "..")) + has_dotdot = 1; + if (!strcmp(name, ".git")) + has_dotgit = 1; has_zero_pad |= *(char *)desc.buffer == '0'; update_tree_entry(&desc); @@ -217,6 +226,12 @@ static int fsck_tree(struct tree *item, int strict, fsck_error error_func) retval += error_func(&item->object, FSCK_WARN, "contains full pathnames"); if (has_empty_name) retval += error_func(&item->object, FSCK_WARN, "contains empty pathname"); + if (has_dot) + retval += error_func(&item->object, FSCK_WARN, "contains '.'"); + if (has_dotdot) + retval += error_func(&item->object, FSCK_WARN, "contains '..'"); + if (has_dotgit) + retval += error_func(&item->object, FSCK_WARN, "contains '.git'"); if (has_zero_pad) retval += error_func(&item->object, FSCK_WARN, "contains zero-padded file modes"); if (has_bad_modes) |