Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
F18220812: D10443.diff
Tue, Aug 19, 4:03 PM
F18143288: D10443.id25115.diff
Thu, Aug 14, 2:35 PM
F18110286: D10443.id25115.diff
Mon, Aug 11, 6:01 PM
F18047989: D10443.diff
Sun, Aug 3, 1:17 PM
F17870397: D10443.id.diff
Jul 28 2025, 1:51 PM
F17853008: D10443.diff
Jul 27 2025, 1:19 PM
F17850176: D10443.id25115.diff
Jul 27 2025, 9:37 AM
F17832783: D10443.diff
Jul 26 2025, 1:04 PM

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