)]}'
{
  "commit": "92b7c7c9f5fde4972a653ddb90eca52c592de07e",
  "tree": "f5ec45a7b6a1c77908b8ce5c1efa65c5393d1b55",
  "parents": [
    "e69bbfa2947ee733a2b76f1dc28ceaf415368f2a"
  ],
  "author": {
    "name": "Ayush Chandekar",
    "email": "ayu.chandekar@gmail.com",
    "time": "Wed Jul 16 17:13:29 2025 +0530"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Wed Jul 16 08:34:20 2025 -0700"
  },
  "message": "config: set comment_line_str to \"#\" when core.commentChar\u003dauto\n\nIf conflict comments already use a comment character that isn\u0027t \"#\", and\ncore.commentChar is set \"auto\", Git will ignore these lines during the\nscan using ignored_log_message_bytes() and pick a new comment character\nbased on the rest of the message. The newly chosen character may be\ndifferent from the one used in the conflict comments and therefore,\nthese are no longer treated as comments and end up in the final commit\nmessage.\n\nFor example, during a rebase if the user previously set\ncore.commentChar\u003d% and then encounters a conflict, conflict comments\nlike \"% Conflicts:\" are generated. If the user subsequently sets\ncore.commentChar\u003dauto before running `rebase --continue`, Git parses the\n\"auto\" setting and begins scanning. It first uses the existing\n\u0027comment_line_str\u0027 (which is \u0027%\u0027) to detect and ignore conflict comments\nvia ignored_log_message_bytes().\n\nThen, Git scans the rest of the message (excluding conflict comments),\nsees that none of the remaining lines start with \u0027#\u0027 and decides to set\ncomment_line_str to \u0027#\u0027. Since the final commit character differs from\nthe one used in the conflict comments, those lines are no longer\nconsidered comments and get included in the final commit message.\n\nSet \u0027comment_line_str\u0027 to \u0027#\u0027 when core.commentChar is set to \u0027auto\u0027 to\nreset any previously set value.\n\nWhile this does not solve the issue of conflict comment inclusion and\nthe user visible behaviour stays tha same, it standardizes the behaviour\nof the code by always resetting \u0027comment_line_str\u0027 to \u0027#\u0027 when\ncore.commentChar\u003dauto is parsed.\n\nThe patch text is based on Phillip Wood\u0027s message:\nhttps://lore.kernel.org/git/9e96aaab-79a2-4632-94cd-d016d4a63b30@gmail.com/\nand the commit log message is wriiten by me.\n\nSigned-off-by: Phillip Wood \u003cphillip.wood@dunelm.org.uk\u003e\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": "b18b5617fcd05d146aec7b44edd50ff53523be39",
      "old_mode": 33188,
      "old_path": "config.c",
      "new_id": "98548578a3f7bb2bebb05be0ffe398f3513435f7",
      "new_mode": 33188,
      "new_path": "config.c"
    }
  ]
}