Merge branch 'master' of git://github.com/alshopov/git-po

diff --git a/entry.c b/entry.c
index 1d1a09f47e80ce0eb454fbe86ab44948fac597a0..1c7e3c11d5075d4b39eeca76ab2272e781f773c8 100644 (file)
--- a/entry.c
+++ b/entry.c
@@ -173,8 +173,7 @@ int finish_delayed_checkout(struct checkout *state)
 
        dco->state = CE_RETRY;
        delayed_object_count = dco->paths.nr;
-       progress = start_progress_delay(
-               _("Filtering content"), delayed_object_count, 50, 1);
+       progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
        while (dco->filters.nr > 0) {
                for_each_string_list_item(filter, &dco->filters) {
                        struct string_list available_paths = STRING_LIST_INIT_NODUP;
@@ -258,7 +257,8 @@ static int write_entry(struct cache_entry *ce,
        char *new;
        struct strbuf buf = STRBUF_INIT;
        unsigned long size;
-       size_t wrote, newsize = 0;
+       ssize_t wrote;
+       size_t newsize = 0;
        struct stat st;
        const struct submodule *sub;
 
@@ -333,7 +333,7 @@ static int write_entry(struct cache_entry *ce,
                        fstat_done = fstat_output(fd, state, &st);
                close(fd);
                free(new);
-               if (wrote != size)
+               if (wrote < 0)
                        return error("unable to write file %s", path);
                break;
        case S_IFGITLINK: