Merge branch 'mh/fsck-reflog-entries'
authorJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:48 +0000 (12:21 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 24 Jun 2015 19:21:48 +0000 (12:21 -0700)
"git fsck" used to ignore missing or invalid objects recorded in reflog.

* mh/fsck-reflog-entries:
fsck: report errors if reflog entries point at invalid objects
fsck_handle_reflog_sha1(): new function

1  2 
builtin/fsck.c
diff --cc builtin/fsck.c
index 4e8e2ee5b739379e387c3875a1d71de8a22a6db6,6b6f31997ccb8b00d4bb7f1a41fb831238ee7554..267979304994158c491b2306388b932c50d7438b
@@@ -476,10 -482,9 +482,10 @@@ static int fsck_handle_reflog_ent(unsig
        return 0;
  }
  
 -static int fsck_handle_reflog(const char *logname, const unsigned char *sha1, int flag, void *cb_data)
 +static int fsck_handle_reflog(const char *logname, const struct object_id *oid,
 +                            int flag, void *cb_data)
  {
-       for_each_reflog_ent(logname, fsck_handle_reflog_ent, NULL);
+       for_each_reflog_ent(logname, fsck_handle_reflog_ent, (void *)logname);
        return 0;
  }