diff options
Diffstat (limited to 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/notes-merge.c b/notes-merge.c index e9d6f86d34..d2771fa3d4 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -695,10 +695,13 @@ int notes_merge_commit(struct notes_merge_options *o, strbuf_addch(&path, '/'); baselen = path.len; - while ((e = readdir_skip_dot_and_dotdot(dir)) != NULL) { + while ((e = readdir(dir)) != NULL) { struct stat st; struct object_id obj_oid, blob_oid; + if (is_dot_or_dotdot(e->d_name)) + continue; + if (get_oid_hex(e->d_name, &obj_oid)) { if (o->verbosity >= 3) printf("Skipping non-SHA1 entry '%s%s'\n", |