)]}'
{
  "commit": "83c4d380171a2ecd24dd2e04072692ec54a7aaa5",
  "tree": "7d06636113e07f74fa407b8e673595d3045d8a41",
  "parents": [
    "dcd1742e56ebb944c4ff62346da4548e1e3be675"
  ],
  "author": {
    "name": "Jeff King",
    "email": "peff@peff.net",
    "time": "Fri Sep 25 17:58:09 2015 -0400"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Mon Sep 28 14:58:13 2015 -0700"
  },
  "message": "merge-file: enforce MAX_XDIFF_SIZE on incoming files\n\nThe previous commit enforces MAX_XDIFF_SIZE at the\ninterfaces to xdiff: xdi_diff (which calls xdl_diff) and\nll_xdl_merge (which calls xdl_merge).\n\nBut we have another direct call to xdl_merge in\nmerge-file.c. If it were written today, this probably would\njust use the ll_merge machinery. But it predates that code,\nand uses slightly different options to xdl_merge (e.g.,\nZEALOUS_ALNUM).\n\nWe could try to abstract out an xdi_merge to match the\nexisting xdi_diff, but even that is difficult. Rather than\nsimply report error, we try to treat large files as binary,\nand that distinction would happen outside of xdi_merge.\n\nThe simplest fix is to just replicate the MAX_XDIFF_SIZE\ncheck in merge-file.c.\n\nSigned-off-by: Jeff King \u003cpeff@peff.net\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "232b76857cf4f6dbd9bec12fa12266e1afc90a5c",
      "old_mode": 33188,
      "old_path": "builtin/merge-file.c",
      "new_id": "04ae36a4528848fcdd10e0f11abdd8b01a2fd167",
      "new_mode": 33188,
      "new_path": "builtin/merge-file.c"
    }
  ]
}