Merge branch 'nd/test-helpers' into maint

diff --git a/builtin/fsck.c b/builtin/fsck.c
index 3f27456883ede5efa2a57cfa9e2dcc889e952338..9923b1089898eaee82fa394dc758b5b2d62c2649 100644 (file)
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -356,6 +356,10 @@ static int fsck_sha1(const unsigned char *sha1)
 static int fsck_obj_buffer(const unsigned char *sha1, enum object_type type,
                           unsigned long size, void *buffer, int *eaten)
 {
+       /*
+        * Note, buffer may be NULL if type is OBJ_BLOB. See
+        * verify_packfile(), data_valid variable for details.
+        */
        struct object *obj;
        obj = parse_object_buffer(sha1, type, size, buffer, eaten);
        if (!obj) {