)]}'
{
  "commit": "e42667241de12840ef58c0ba1c060b86c850bae0",
  "tree": "28a29534bf7fa43c0389ea8d0543f03351995f89",
  "parents": [
    "cb96e1697ad6e54d11fc920c95f82977f8e438f8"
  ],
  "author": {
    "name": "Elijah Newren",
    "email": "newren@gmail.com",
    "time": "Fri May 16 16:26:26 2025 +0000"
  },
  "committer": {
    "name": "Junio C Hamano",
    "email": "gitster@pobox.com",
    "time": "Fri May 16 12:28:27 2025 -0700"
  },
  "message": "sequencer: make it clearer that commit descriptions are just comments\n\nEvery once in a while, users report that editing the commit summaries\nin the todo list does not get reflected in the rebase operation,\nsuggesting that users are (a) only using one-line commit messages, and\n(b) not understanding that the commit summaries are merely helpful\ncomments to help them find the right hashes.\n\nIt may be difficult to correct users\u0027 poor commit messages, but we can\nat least try to make it clearer that the commit summaries are not\ndirectives of some sort by inserting a comment character.  Hopefully\nthat leads to them looking a little further and noticing the hints at\nthe bottom to use \u0027reword\u0027 or \u0027edit\u0027 directives.\n\nYes, this change may look funny at first since it hardcodes \u0027#\u0027 rather\nthan using comment_line_str.  However:\n\n  * comment_line_str exists to allow disambiguation between lines in\n    a commit message and lines that are instructions to users editing\n    the commit message.  No such disambiguation is needed for these\n    comments that occur on the same line after existing directives\n  * the exact \"comment\" character(s) on regular pick lines used aren\u0027t\n    actually important; I could have used anything, including completely\n    random variable length text for each line and it\u0027d work because we\n    ignore everything after \u0027pick\u0027 and the hash.\n  * The whole point of this change is to signal to users that they\n    should NOT be editing any part of the line after the hash (and if\n    they do so, their edits will be ignored), while the whole point of\n    comment_line_str is to allow highly flexible editing.  So making\n    it more general by using comment_line_str actually feels\n    counterproductive.\n  * The character for merge directives absolutely must be \u0027#\u0027; that\n    has been deeply hardcoded for a long time (see below), and will\n    break if some other comment character is used instead.  In a\n    desire to have pick and merge directives be similar, I use the\n    same comment character for both.\n  * Perhaps merge directives could be fixed to not be inflexible about\n    the comment character used, if someone feels highly motivated, but\n    I think that should be done in a separate follow-on patch.\n\nHere are (some of?) the locations where \u0027#\u0027 has already been hardcoded\nfor a long time for merges:\n\n  1) In check_label_or_ref_arg():\n\tcase TODO_LABEL:\n\t\t/*\n\t\t * \u0027#\u0027 is not a valid label as the merge command uses it to\n\t\t * separate merge parents from the commit subject.\n\t\t */\n\n  2) In do_merge():\n\n\t/*\n\t * For octopus merges, the arg starts with the list of revisions to be\n\t * merged. The list is optionally followed by \u0027#\u0027 and the oneline.\n\t */\n\tmerge_arg_len \u003d oneline_offset \u003d arg_len;\n\tfor (p \u003d arg; p - arg \u003c arg_len; p +\u003d strspn(p, \" \\t\\n\")) {\n\t\tif (!*p)\n\t\t\tbreak;\n\t\tif (*p \u003d\u003d \u0027#\u0027 \u0026\u0026 (!p[1] || isspace(p[1]))) {\n\n  3) In label_oid():\n\n\t\tif ((buf-\u003elen \u003d\u003d the_hash_algo-\u003ehexsz \u0026\u0026\n\t\t     !get_oid_hex(label, \u0026dummy)) ||\n\t\t    (buf-\u003elen \u003d\u003d 1 \u0026\u0026 *label \u003d\u003d \u0027#\u0027) ||\n\t\t    hashmap_get_from_hash(\u0026state-\u003elabels,\n\t\t\t\t\t  strihash(label), label)) {\n\t\t\t/*\n\t\t\t * If the label already exists, or if the label is a\n\t\t\t * valid full OID, or the label is a \u0027#\u0027 (which we use\n\t\t\t * as a separator between merge heads and oneline), we\n\t\t\t * append a dash and a number to make it unique.\n\t\t\t */\n\nSigned-off-by: Elijah Newren \u003cnewren@gmail.com\u003e\nSigned-off-by: Junio C Hamano \u003cgitster@pobox.com\u003e\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "b5c4043757e948aedaad0782dff947373e2f45ea",
      "old_mode": 33188,
      "old_path": "sequencer.c",
      "new_id": "2735966544bc8ab10cf2984a3e9aff67d78cfd15",
      "new_mode": 33188,
      "new_path": "sequencer.c"
    },
    {
      "type": "modify",
      "old_id": "2aee9789a2fae2a4d6a6d5b1205238d229a0a4f5",
      "old_mode": 33261,
      "old_path": "t/t3404-rebase-interactive.sh",
      "new_id": "6bac217ed3555e73edad9c3f9612608b0bfd15b4",
      "new_mode": 33261,
      "new_path": "t/t3404-rebase-interactive.sh"
    },
    {
      "type": "modify",
      "old_id": "fcc40d6fe1fd5b2a9c4f2a5e4ede15e73c247790",
      "old_mode": 33261,
      "old_path": "t/t3415-rebase-autosquash.sh",
      "new_id": "26b42a526a1944492882589c93d16dc4831cc26f",
      "new_mode": 33261,
      "new_path": "t/t3415-rebase-autosquash.sh"
    },
    {
      "type": "modify",
      "old_id": "b84d68c4b96bc9d531acfdd48d48571902b744ea",
      "old_mode": 33261,
      "old_path": "t/t3430-rebase-merges.sh",
      "new_id": "5f8fa05420c269069053e376c80640bac5a8ece9",
      "new_mode": 33261,
      "new_path": "t/t3430-rebase-merges.sh"
    },
    {
      "type": "modify",
      "old_id": "47534f1062d203a9b823d545740004e2002162ff",
      "old_mode": 33261,
      "old_path": "t/t5520-pull.sh",
      "new_id": "63c9a8f04b1cb9873c60fe5ccdf86705b4f0623b",
      "new_mode": 33261,
      "new_path": "t/t5520-pull.sh"
    },
    {
      "type": "modify",
      "old_id": "802f8f704c62eb11192bcc82ecd35f0ae53b5a6a",
      "old_mode": 33261,
      "old_path": "t/t7512-status-help.sh",
      "new_id": "25e8e9711f8fefdaf935bdd163fd367f4c8b9f32",
      "new_mode": 33261,
      "new_path": "t/t7512-status-help.sh"
    }
  ]
}