Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
F15414915: D10443.id.diff
Thu, Mar 20, 3:07 AM
F15391208: D10443.diff
Sat, Mar 15, 8:44 AM
F15352916: D10443.diff
Mon, Mar 10, 7:08 PM
Unknown Object (File)
Thu, Feb 27, 9:09 AM
Unknown Object (File)
Feb 19 2025, 3:46 AM
Unknown Object (File)
Feb 19 2025, 3:46 AM
Unknown Object (File)
Feb 19 2025, 3:44 AM
Unknown Object (File)
Feb 14 2025, 9:27 AM

Details

Summary

This is in an effort to simplify test automation around dependent diffs workflow.
If you have dependent diffs where some of the dependencies have already landed into HEAD, a arc patch --nobranch on the dependent diff fails since 'get cherry-pick' does not allow empty commits.
This lets you set a flag that gets passed down to git cherry-pick which allows and keeps empty commits around.

Fixes one of the problems mentioned in T5986

Test Plan

arc patch --nobranch D1 fails, but arc patch --nobranch --keep-redundant-commits D1 runs successfully and adds a empty commit to the working copy.

Diff Detail

Repository
rARC Arcanist
Branch
kec
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 2464
Build 2468: [Placeholder Plan] Wait for 30 Seconds