summaryrefslogtreecommitdiff
path: root/fsck-objects.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-10 14:16:16 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-10 14:16:16 -0800
commitccd14e569dcfe1a83b33f84fad8cfed68676ef5d (patch)
tree49e3e8737ae4284a3351505115ba30ac1ec30a43 /fsck-objects.c
parent6fc301bbf68decbda369402a11ef215391bdd533 (diff)
parent883d60fa97c6397450fb129634054e0a6101baac (diff)
downloadgit-ccd14e569dcfe1a83b33f84fad8cfed68676ef5d.tar.gz
Merge branch 'js/reflog'
* js/reflog: Sanitize for_each_reflog_ent()
Diffstat (limited to 'fsck-objects.c')
-rw-r--r--fsck-objects.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/fsck-objects.c b/fsck-objects.c
index 1cc3b399bc..0d8a8ebb46 100644
--- a/fsck-objects.c
+++ b/fsck-objects.c
@@ -399,7 +399,9 @@ static void fsck_dir(int i, char *path)
static int default_refs;
-static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1, char *datail, void *cb_data)
+static int fsck_handle_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
+ const char *email, unsigned long timestamp, int tz,
+ const char *message, void *cb_data)
{
struct object *obj;