diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-07-05 22:32:56 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-05 22:32:56 +0200 |
| commit | 5ab148dda0076a136b4afb385d96bd9cdc4d2590 (patch) | |
| tree | 6e6876952e2e6a1154258c9a9e11428572d4dcf9 /builtin/fsck.c | |
| parent | Merge branch 'bw/repo-object' (diff) | |
| parent | sha1_file: guard against invalid loose subdirectory numbers (diff) | |
| download | git-5ab148dda0076a136b4afb385d96bd9cdc4d2590.tar.xz git-5ab148dda0076a136b4afb385d96bd9cdc4d2590.zip | |
Merge branch 'rs/sha1-name-readdir-optim'
Optimize "what are the object names already taken in an alternate
object database?" query that is used to derive the length of prefix
an object name is uniquely abbreviated to.
* rs/sha1-name-readdir-optim:
sha1_file: guard against invalid loose subdirectory numbers
sha1_file: let for_each_file_in_obj_subdir() handle subdir names
p4205: add perf test script for pretty log formats
sha1_name: cache readdir(3) results in find_short_object_filename()
Diffstat (limited to 'builtin/fsck.c')
| -rw-r--r-- | builtin/fsck.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/fsck.c b/builtin/fsck.c index 87c6756899..99dea7adf6 100644 --- a/builtin/fsck.c +++ b/builtin/fsck.c @@ -537,7 +537,7 @@ static int fsck_cruft(const char *basename, const char *path, void *data) return 0; } -static int fsck_subdir(int nr, const char *path, void *progress) +static int fsck_subdir(unsigned int nr, const char *path, void *progress) { display_progress(progress, nr + 1); return 0; |