From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 24 Jun 2015 19:21:48 +0000 (-0700)
Subject: Merge branch 'mh/fsck-reflog-entries'
X-Git-Tag: v2.5.0-rc0~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f61ccf15d7699bf8ce13d08337573a5baecfe47;p=git

Merge branch 'mh/fsck-reflog-entries'

"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
---

8f61ccf15d7699bf8ce13d08337573a5baecfe47
diff --cc builtin/fsck.c
index 4e8e2ee5b7,6b6f31997c..2679793049
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@@ -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;
  }