Merge branch 'xz/send-email-batch-size'

diff --git a/builtin/prune.c b/builtin/prune.c
index 8dcfecde0f363e05fc2b95db3d8fce04d665ecf8..c378690545b27b7e4753e0f919f3ea6626b0eae9 100644 (file)
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -68,7 +68,7 @@ static int prune_cruft(const char *basename, const char *path, void *data)
        return 0;
 }
 
-static int prune_subdir(int nr, const char *path, void *data)
+static int prune_subdir(unsigned int nr, const char *path, void *data)
 {
        if (!show_only)
                rmdir(path);
@@ -123,11 +123,12 @@ int cmd_prune(int argc, const char **argv, const char *prefix)
                die(_("cannot prune in a precious-objects repo"));
 
        while (argc--) {
-               unsigned char sha1[20];
+               struct object_id oid;
                const char *name = *argv++;
 
-               if (!get_sha1(name, sha1)) {
-                       struct object *object = parse_object_or_die(sha1, name);
+               if (!get_oid(name, &oid)) {
+                       struct object *object = parse_object_or_die(&oid,
+                                                                   name);
                        add_pending_object(&revs, object, "");
                }
                else