Page MenuHomePhabricator

Add "is merge commit" Herald field for pre-commit rules
ClosedPublic

Authored by epriestley on Dec 20 2013, 12:23 AM.
Tags
None
Referenced Files
F19504625: D7809.id17666.diff
Fri, Jan 9, 5:42 AM
F19273226: D7809.diff
Mon, Dec 22, 11:26 PM
F18909326: D7809.diff
Nov 9 2025, 2:02 AM
F18750837: D7809.id.diff
Oct 4 2025, 9:02 AM
F18744299: D7809.diff
Oct 3 2025, 2:29 AM
F18434088: D7809.id.diff
Aug 31 2025, 8:51 AM
F18408181: D7809.diff
Aug 30 2025, 2:11 AM
F18087707: D7809.id17674.diff
Aug 6 2025, 5:10 AM
Subscribers

Details

Summary

Ref T4195. This allows you to write rules which disallow merge commits.

Also make the reject message a little more useful.

Test Plan
remote: This push was rejected by Herald push rule H27.
remote: Change: commit/daed0d448404
remote:   Rule: No Merges
remote: Reason: No merge commits allowed. If you must push a merge, include "@force-merge" in the commit message.

Diff Detail

Lint
Lint Skipped
Unit
Tests Skipped