Merge ~cjwatson/pmr:better-git-commit-messages into ~thomir-deactivatedaccount/pmr:master
Status: | Merged |
---|---|
Approved by: | Thomi Richards |
Approved revision: | 6bed5fe767ec24e57e122ccbd0703f9ba0283f33 |
Merged at revision: | 6bed5fe767ec24e57e122ccbd0703f9ba0283f33 |
Proposed branch: | ~cjwatson/pmr:better-git-commit-messages |
Merge into: | ~thomir-deactivatedaccount/pmr:master |
Diff against target: |
53 lines (+23/-1) 1 file modified
process-merge-requests (+23/-1) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Thomi Richards | Pending | ||
Review via email: mp+305538@code.launchpad.net |
Commit message
Produce nicer git commit messages
This avoids ugly "Merge commit '<hash>' into <merge-id>" messages, and
causes the commit_message field on merge proposals to mean something.
We now always create a merge commit, and construct a commit message that
includes the merge proposal ID, a shortened version of the repository
and path that match the titles of merge proposals in the Launchpad web
UI, and the commit_message field from the merge proposal. For example,
one might end up with:
Merge #300000 from ~contributor/
Rotate weasels instead of stoats
Stoats object to being rotated, so rotate weasels instead. Unless
otherwise specified, mustelid-rotation is through 180 degrees.
Description of the change
Produce nicer git commit messages
This avoids ugly "Merge commit '<hash>' into <merge-id>" messages, and
causes the commit_message field on merge proposals to mean something.
We now always create a merge commit, and construct a commit message that
includes the merge proposal ID, a shortened version of the repository
and path that match the titles of merge proposals in the Launchpad web
UI, and the commit_message field from the merge proposal. For example,
one might end up with:
Merge #300000 from ~contributor/
Rotate weasels instead of stoats
Stoats object to being rotated, so rotate weasels instead. Unless
otherwise specified, mustelid-rotation is through 180 degrees.