)]}'
{
  "commit": "a68cca9953cf2e9ef64f355455164025bae0b188",
  "tree": "3fe43e0f7bc474ef0a855547d261ea466f411f15",
  "parents": [
    "e9019fcafe0040228b8631c30f97ae1adb61bcdc"
  ],
  "author": {
    "name": "Thomas Bachem",
    "email": "mail@thomasbachem.com",
    "time": "Thu Oct 01 08:24:16 2026 +0000"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Thu Oct 01 06:36:38 2026 -0700"
  },
  "message": "t5520: don\u0027t expire reflogs where it matters\n\n\"git merge\" saves any uncommitted changes with \"git stash\" before it\ntries a merge strategy. When the strategy does not handle the merge,\nit restores them with \"git stash apply --index\". If some of the\nchanges are staged, that runs \"git reset\", which writes an entry to\nthe reflog of HEAD. The tests that pull with autostash disabled run\neight such merges, each with a new file staged.\n\nAn upcoming change makes \"git stash apply --index\" merge the index\nin-core, so it no longer runs \"git reset\" and those entries go away.\nAnother makes the default \"merge\" backend of \"git rebase\" run auto\nmaintenance when it finishes. Together, they change when auto\nmaintenance expires the reflogs.\n\nThis means that unfortunately the reflogs are expired at the end of\n\"git pull --rebase\" in the \"--rebase with rebased upstream\" test. The\n\"git pull --rebase -f\" in the next test looks for the fork point in\nthe reflog of refs/remotes/me/copy, but as the test suite dates every\nreflog entry to 2005, the expiry has emptied that reflog. Pull then\nfinds no fork point, so the rebase also replays copy-orig, the commit\n\"copy\" was rewound from, and it conflicts.\n\nDisable reflog expiration in this script, as ea7d894f44 (t34xx: don\u0027t\nexpire reflogs where it matters, 2026-02-24) did for the rebase tests,\nso that the test no longer depends on where the expiry falls.\n\nReported-by: Junio C Hamano \u003cgitster@pobox.com\u003e\nHelped-by: D. Ben Knoble \u003cben.knoble@gmail.com\u003e\nHelped-by: Phillip Wood \u003cphillip.wood@dunelm.org.uk\u003e\nAssisted-by: Claude Fable 5.1\nSigned-off-by: Thomas Bachem \u003cmail@thomasbachem.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "0e0019347e85e9949fe6c2c63b9f86f6c4ce4519",
      "old_mode": 33261,
      "old_path": "t/t5520-pull.sh",
      "new_id": "3b0f61ec60a75369f19b032bad7f6e96e3d4367a",
      "new_mode": 33261,
      "new_path": "t/t5520-pull.sh"
    }
  ]
}