)]}'
{
  "commit": "2c65d90f7579a0e2a6460eebce44795587e87043",
  "tree": "6b51679f6aaf76f1dd2a3eda6d2bdc6ef75928bb",
  "parents": [
    "ce17feb1b3ecfb0344af9b9111a4b4d313d51d7a"
  ],
  "author": {
    "name": "brian m. carlson",
    "email": "sandals@crustytoothpaste.net",
    "time": "Mon Sep 02 22:39:44 2019 +0000"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Tue Sep 03 15:16:18 2019 -0700"
  },
  "message": "am: reload .gitattributes after patching it\n\nWhen applying multiple patches with git am, or when rebasing using the\nam backend, it\u0027s possible that one of our patches has updated a\ngitattributes file. Currently, we cache this information, so if a\nfile in a subsequent patch has attributes applied, the file will be\nwritten out with the attributes in place as of the time we started the\nrebase or am operation, not with the attributes applied by the previous\npatch. This problem does not occur when using the -m or -i flags to\nrebase.\n\nTo ensure we write the correct data into the working tree, expire the\ncache after each patch that touches a path ending in \".gitattributes\".\nSince we load these attributes in multiple separate files, we must\nexpire them accordingly.\n\nVerify that both the am and rebase code paths work correctly, including\nthe conflict marker size with am -3.\n\nSigned-off-by: brian m. carlson \u003csandals@crustytoothpaste.net\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "4992eca416c9c2b5d21de42460cafa839df25f4e",
      "old_mode": 33188,
      "old_path": "apply.c",
      "new_id": "2e11438667eabfa15aa1e7be8f359e2c6896237b",
      "new_mode": 33188,
      "new_path": "apply.c"
    },
    {
      "type": "modify",
      "old_id": "94ff8376492257782a1af5b3d2851ee8724c2edd",
      "old_mode": 33188,
      "old_path": "convert.c",
      "new_id": "deb6f71b2d164fc87dab3b741da34dde98c51374",
      "new_mode": 33188,
      "new_path": "convert.c"
    },
    {
      "type": "modify",
      "old_id": "831559f10d4442b35a43c642b0fd6c203d996f3c",
      "old_mode": 33188,
      "old_path": "convert.h",
      "new_id": "3710969d43d6a16c6eab2e8302f962aa466ccd9f",
      "new_mode": 33188,
      "new_path": "convert.h"
    },
    {
      "type": "modify",
      "old_id": "5b8d46aedee72aab8b027cf4310b4234268965b6",
      "old_mode": 33188,
      "old_path": "ll-merge.c",
      "new_id": "d65a8971db732782822feede96e02f86d336e547",
      "new_mode": 33188,
      "new_path": "ll-merge.c"
    },
    {
      "type": "modify",
      "old_id": "b9e2af1c884042adda8127a07ce8565b64303047",
      "old_mode": 33188,
      "old_path": "ll-merge.h",
      "new_id": "e78973dd55ed596e26dcf4a372671ad03b97986a",
      "new_mode": 33188,
      "new_path": "ll-merge.h"
    },
    {
      "type": "modify",
      "old_id": "42f147858d7c2e87d6920cdd77744e99bf77001b",
      "old_mode": 33261,
      "old_path": "t/t3400-rebase.sh",
      "new_id": "4f22e6d3d82cb739c6db7190ead5f94e6ad03c0a",
      "new_mode": 33261,
      "new_path": "t/t3400-rebase.sh"
    },
    {
      "type": "modify",
      "old_id": "3f7f750cc8d7442458323f9ec77a371db3818320",
      "old_mode": 33261,
      "old_path": "t/t4150-am.sh",
      "new_id": "4f1e24ecbecd87667251eab612c9b966405d53c6",
      "new_mode": 33261,
      "new_path": "t/t4150-am.sh"
    }
  ]
}