)]}'
{
  "commit": "e69bbfa2947ee733a2b76f1dc28ceaf415368f2a",
  "tree": "dbeb020b90a761388cebb55609fd3f081e32edf5",
  "parents": [
    "16bd9f20a403117f2e0d9bcda6c6e621d3763e77"
  ],
  "author": {
    "name": "Ayush Chandekar",
    "email": "ayu.chandekar@gmail.com",
    "time": "Wed Jul 16 17:13:28 2025 +0530"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Jul 16 08:25:17 2025 -0700"
  },
  "message": "commit: avoid scanning trailing comments when \u0027core.commentChar\u0027 is \"auto\"\n\nWhen core.commentChar is set to \"auto\", Git selects a comment character\nby scanning the commit message contents and avoiding any character\nalready present in the message.\n\nIf the message still contains old conflict comments (starting with a\ncomment character), Git assumes that character is in use and chooses a\ndifferent one. As a result, those existing comment lines are no longer\nrecognized as comments and end up being included in the final commit\nmessage.\n\nTo avoid this, skip scanning the trailing comment block when selecting\nthe comment character. This allows Git to safely reuse the original\ncharacter when appropriate, keeping the commit message clean and free of\nleftover conflict information.\n\nBackground:\n\nThe \"auto\" value for core.commentchar was introduced in the commit\n84c9dc2c5a (commit: allow core.commentChar\u003dauto for character auto\nselection, 2014-05-17) but did not exhibit this issue at that time.\n\nThe bug was introduced in commit a6c2654f83 (rebase -m: fix --signoff\nwith conflicts, 2024-04-18) where Git started writing conflict comments\nto the file at \u0027rebase_path_message()\u0027.\n\nMentored-by: Christian Couder \u003cchristian.couder@gmail.com\u003e\nMentored-by: Ghanshyam Thakkar \u003cshyamthakkar001@gmail.com\u003e\nSigned-off-by: Ayush Chandekar \u003cayu.chandekar@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "fba0dded64a718e5e19bcbe22d7b69bea31d7275",
      "old_mode": 33188,
      "old_path": "builtin/commit.c",
      "new_id": "63e7158e9873edb9693ef0144be1f1e8994a18b3",
      "new_mode": 33188,
      "new_path": "builtin/commit.c"
    },
    {
      "type": "modify",
      "old_id": "127216f7225aa412022bb0f296f716c42ce15f56",
      "old_mode": 33261,
      "old_path": "t/t3418-rebase-continue.sh",
      "new_id": "b8a8dd77e74408bda02f2f63f8329222823819f0",
      "new_mode": 33261,
      "new_path": "t/t3418-rebase-continue.sh"
    }
  ]
}