Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
F15526976: D10443.diff
Mon, Apr 21, 11:54 PM
F15525312: D10443.id25115.diff
Mon, Apr 21, 1:31 PM
F15464691: D10443.id.diff
Apr 2 2025, 12:24 PM
F15463788: D10443.id25115.diff
Apr 2 2025, 3:14 AM
F15462276: D10443.diff
Apr 1 2025, 1:38 PM
F15440839: D10443.id25115.diff
Mar 26 2025, 2:54 PM
F15414915: D10443.id.diff
Mar 20 2025, 3:07 AM
F15391208: D10443.diff
Mar 15 2025, 8:44 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