summaryrefslogtreecommitdiff
path: root/builtin/prune-packed.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-07-05 13:32:56 -0700
committerJunio C Hamano <gitster@pobox.com>2017-07-05 13:32:56 -0700
commit5ab148dda0076a136b4afb385d96bd9cdc4d2590 (patch)
tree6e6876952e2e6a1154258c9a9e11428572d4dcf9 /builtin/prune-packed.c
parent85ce4a6828a418a22c69a870b3e059481b4263d6 (diff)
parent70c49050d4a16a7e2990e4d3c91d9d12f62e631e (diff)
downloadgit-5ab148dda0076a136b4afb385d96bd9cdc4d2590.tar.gz
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/prune-packed.c')
-rw-r--r--builtin/prune-packed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index c026299e78..ac978ad401 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -10,7 +10,7 @@ static const char * const prune_packed_usage[] = {
static struct progress *progress;
-static int prune_subdir(int nr, const char *path, void *data)
+static int prune_subdir(unsigned int nr, const char *path, void *data)
{
int *opts = data;
display_progress(progress, nr + 1);