Page MenuHomePhabricator

Allow arc patch to keep empty commits
Needs ReviewPublic

Authored by vm on Sep 8 2014, 6:22 PM.



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

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

Event Timeline

vm updated this revision to Diff 25115.Sep 8 2014, 6:22 PM
vm retitled this revision from to Allow arc patch to keep empty commits.
vm updated this object.
vm edited the test plan for this revision. (Show Details)
vm added a reviewer: epriestley.
vm added a subscriber: seshness.
vm added a comment.Oct 15 2014, 6:56 AM

any updates?

BYK added a subscriber: BYK.Jun 3 2015, 9:39 PM
branden added a subscriber: branden.Jun 4 2015, 7:17 PM