Merge branch 'maint'

diff --git a/builtin-fsck.c b/builtin-fsck.c
index 7326dc33a586dfbadf5bc35ac628b1f8690a6a09..d3f3de9446a9184e9457fe4b743c4e43a9256597 100644 (file)
--- a/builtin-fsck.c
+++ b/builtin-fsck.c
@@ -385,6 +385,8 @@ static void fsck_dir(int i, char *path)
                        add_sha1_list(sha1, DIRENT_SORT_HINT(de));
                        continue;
                }
+               if (!prefixcmp(de->d_name, "tmp_obj_"))
+                       continue;
                fprintf(stderr, "bad sha1 file: %s/%s\n", path, de->d_name);
        }
        closedir(dir);