Merge branch 'jk/ambiguous-short-object-names'

diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 94e67ebb7eec087390cfecc5c4371a974401d602..cca97a86c0b1d1029936184f72ed6a20e97da759 100644 (file)
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -401,11 +401,12 @@ struct object_cb_data {
        struct expand_data *expand;
 };
 
-static void batch_object_cb(const unsigned char sha1[20], void *vdata)
+static int batch_object_cb(const unsigned char sha1[20], void *vdata)
 {
        struct object_cb_data *data = vdata;
        hashcpy(data->expand->oid.hash, sha1);
        batch_object_write(NULL, data->opt, data->expand);
+       return 0;
 }
 
 static int batch_loose_object(const unsigned char *sha1,