sha1_name: add get_sha1_with_context()

diff --git a/preload-index.c b/preload-index.c
index 14d52811832d8f2a3f6c1e1e5502c51ce73da82e..e3d0bda31a98372eb9b6a8c2cd0fd65917a9dbde 100644 (file)
--- a/preload-index.c
+++ b/preload-index.c
@@ -47,6 +47,8 @@ static void *preload_thread(void *_data)
 
                if (ce_stage(ce))
                        continue;
+               if (S_ISGITLINK(ce->ce_mode))
+                       continue;
                if (ce_uptodate(ce))
                        continue;
                if (!ce_path_match(ce, p->pathspec))
@@ -76,7 +78,7 @@ static void preload_index(struct index_state *index, const char **pathspec)
        if (threads > MAX_PARALLEL)
                threads = MAX_PARALLEL;
        offset = 0;
-       work = (index->cache_nr + threads - 1) / threads;
+       work = DIV_ROUND_UP(index->cache_nr, threads);
        for (i = 0; i < threads; i++) {
                struct thread_data *p = data+i;
                p->index = index;