Bug 245255 – [git-webkit] prepare-commit-msg does not work with --reedit-message and --reuse-message

• Status: NEW
• Component: Tools / Tests

[Elliott Williams]

These git-commit options allow you to use the commit message from a different commit, and optionally stop for editing. They allow you to "rewrite" a commit by resetting to `main`, staging new changes, then running `git commit --reedit-message "HEAD@{1}"` to make changes to the old commit message.

Our prepare-commit-msg hook completely overwrites the commit message staged by these options, making them unusable. It should preserve the original message, and only list modified files in the comment section below the message body.

[Radar WebKit Bug Importer]

<rdar://problem/100300158>

[Sam Sneddon [:gsnedders]]

This looks like it was fixed by Bug 255121, except when I just tried to do this I got:

gsnedders@gsnedders-marsha webkitpy % git commit -c b318aede1356
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Sam Sneddon <[e-mail]>.
  Running status to find changed, added, or removed files.
  Reviewing diff to determine which lines changed.
  Extracting affected function names from source files.
  Change author: Abrar Rahman Protyasha <[e-mail]>.

And it displayed the author and commit message of `main` rather than of `b318aede1356`.