Merge branch 'sb/cocci-pending'

diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index 9bd8a14b57b8e1b014503dffbcffa27e7242d67a..5790f0d554b0aed2ea36a38c289cc6ce2c3c0faf 100644 (file)
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -253,7 +253,7 @@ static void export_blob(const struct object_id *oid)
 
        mark_next_object(object);
 
-       printf("blob\nmark :%"PRIu32"\ndata %lu\n", last_idnum, size);
+       printf("blob\nmark :%"PRIu32"\ndata %"PRIuMAX"\n", last_idnum, (uintmax_t)size);
        if (size && fwrite(buf, size, 1, stdout) != 1)
                die_errno("could not write blob '%s'", oid_to_hex(oid));
        printf("\n");
@@ -384,7 +384,7 @@ static void show_filemodify(struct diff_queue_struct *q,
                                string_list_insert(changed, spec->path);
                                putchar('\n');
 
-                               if (!oidcmp(&ospec->oid, &spec->oid) &&
+                               if (oideq(&ospec->oid, &spec->oid) &&
                                    ospec->mode == spec->mode)
                                        break;
                        }
@@ -1033,7 +1033,7 @@ int cmd_fast_export(int argc, const char **argv, const char *prefix)
        /* we handle encodings */
        git_config(git_default_config, NULL);
 
-       init_revisions(&revs, prefix);
+       repo_init_revisions(the_repository, &revs, prefix);
        init_revision_sources(&revision_sources);
        revs.topo_order = 1;
        revs.sources = &revision_sources;