Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
F12835835: D10443.diff
Thu, Mar 28, 3:26 PM
Unknown Object (File)
Thu, Mar 28, 4:03 AM
Unknown Object (File)
Tue, Mar 26, 5:12 PM
Unknown Object (File)
Sun, Mar 3, 10:10 AM
Unknown Object (File)
Fri, Mar 1, 12:26 PM
Unknown Object (File)
Fri, Mar 1, 12:26 PM
Unknown Object (File)
Feb 19 2024, 7:35 AM
Unknown Object (File)
Feb 12 2024, 8:38 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